gitlab-org--gitlab-foss/app
Dmitriy Zaporozhets e21ca9f8b1
Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-07-24 10:54:42 +03:00
..
assets Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 2014-07-24 10:54:42 +03:00
controllers Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 2014-07-24 10:54:42 +03:00
finders Explore area 2014-07-23 11:13:33 +03:00
helpers Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 2014-07-24 10:54:42 +03:00
mailers Update specs. 2014-07-16 09:51:20 +02:00
models Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 2014-07-24 10:54:42 +03:00
services Merge branch 'new_user_password_set' into 'master' 2014-07-23 16:44:07 +00:00
uploaders
views Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 2014-07-24 10:54:42 +03:00
workers