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
..
assets	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
controllers	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
decorators
helpers
mailers
models	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
uploaders
views	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
workers