Files
gitlabhq/app/assets/javascripts
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
2014-10-02 13:24:59 +03:00
..
2014-02-24 21:54:12 +02:00
2014-05-29 18:57:27 +03:00
2014-09-25 18:00:21 +03:00
2014-09-01 11:49:17 +02:00
2013-08-08 11:40:42 +03:00