gitlab-org--gitlab-foss/app/views/admin
Dmitriy Zaporozhets c3cf32e863
Merge branch 'version-check' into gl-version-check
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/views/admin/application_settings/_form.html.haml
	db/schema.rb
2015-05-08 16:05:00 +03:00
..
application_settings Merge branch 'version-check' into gl-version-check 2015-05-08 16:05:00 +03:00
applications
background_jobs
broadcast_messages
dashboard
deploy_keys
groups
hooks
keys
logs
projects
services
users