Dmitriy Zaporozhets d41940d36e Merge branch 'master' into 6-0-dev ... Conflicts: app/views/projects/issues/show.html.haml db/fixtures/development/09_issues.rb db/fixtures/development/10_merge_requests.rb		2013-06-24 22:13:00 +03:00
..
development	Merge branch 'master' into 6-0-dev	2013-06-24 22:13:00 +03:00
production	Force admin to change password after first sign-in	2013-06-13 20:06:33 +03:00
test	Use Rails.root.join where appropriate	2012-09-26 16:32:26 -04:00