Pavel Chipiga 644d57b420 Merge branch 'catalog' ... Conflicts: Gemfile Gemfile.lock app/views/layouts/application.html.haml app/views/repositories/show.html.haml config/locales/ru.yml config/routes.rb db/schema.rb		2011-10-21 17:55:41 +03:00
..
controllers	Merge branch 'private_repos'	2011-10-20 19:49:35 +04:00
factories	freeze + spec	2011-03-17 17:47:16 +03:00
helpers	Merge branch 'private_repos'	2011-10-20 19:49:35 +04:00
mailers	User management	2011-03-11 00:48:15 +03:00
models	Merge branch 'catalog'	2011-10-21 17:55:41 +03:00
spec_helper.rb	Initial commit	2011-03-09 16:13:36 +03:00