Dmitriy Zaporozhets 08994f3f60 Merge remote-tracking branch 'origin/merge_button' ... Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb		2012-04-21 12:22:56 +03:00
..
hooks_trait.rb	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
permissions_trait.rb	Project model refactored. Modularity gem	2012-03-28 10:44:51 +03:00
repository_trait.rb	1. Improved admin -> new project form	2012-04-17 20:27:18 +03:00
validations_trait.rb	Project model refactored. Modularity gem	2012-03-28 10:44:51 +03:00