diff options
author | Aleksei Kvitinskii <aleksei.wm@gmail.com> | 2011-11-08 23:19:42 +0200 |
---|---|---|
committer | Aleksei Kvitinskii <aleksei.wm@gmail.com> | 2011-11-08 23:19:42 +0200 |
commit | 1d85197b08346c99e6015cb25b31f8fd10f4100f (patch) | |
tree | 619a753c0a08c97f055f15abc98794fc769776ca /app/helpers/dashboard_helper.rb | |
parent | 5b1634cd4b1bdd29b6bdd2141cd24b6dffc2fb3e (diff) | |
parent | 1fa01cbcc9f8fb5a9dbf5974496d029f1d189cfc (diff) | |
download | gitlab-ce-1d85197b08346c99e6015cb25b31f8fd10f4100f.tar.gz |
Merge branch 'issue-184' into dev
Conflicts:
app/views/layouts/project.html.haml
app/views/projects/_form.html.haml
Diffstat (limited to 'app/helpers/dashboard_helper.rb')
0 files changed, 0 insertions, 0 deletions