Vokhmin Alexey V d6234ae758 Merge branch 'master' into rails-4.1.9 ... Conflicts: app/controllers/projects/git/trees_controller.rb		2015-03-06 00:53:44 +03:00
..
base_controller.rb	rename *_filter => *_action	2015-03-05 02:19:19 +03:00
blobs_controller.rb	rename *_filter => *_action	2015-03-05 02:19:19 +03:00
commits_controller.rb	#456: add integration with Group#default_branch, specs	2015-02-20 01:03:04 +03:00
trees_controller.rb	Merge branch 'master' into rails-4.1.9	2015-03-06 00:53:44 +03:00