Files
gitlabhq/doc/install
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-03-07 15:18:41 +01:00
2014-12-24 10:58:49 -05:00
2014-12-24 12:48:40 +01:00
2014-09-01 19:33:13 -07:00