Files
gitlabhq/app/assets/javascripts
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
2014-12-26 15:05:43 +02:00
..
2014-10-07 11:17:04 -05:00
2014-10-20 23:03:33 +02:00
2014-12-15 16:10:56 +03:00
2014-09-01 11:49:17 +02:00
2014-12-24 13:39:35 +02:00