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
..
fixtures	Fix db seeds for dev	2012-03-22 00:09:55 +02:00
migrate	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
pkey.example	init commit	2011-10-09 00:36:38 +03:00
schema.rb	Merge remote-tracking branch 'origin/merge_button'	2012-04-21 12:22:56 +03:00
seeds.rb	init commit	2011-10-09 00:36:38 +03:00