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
..
migrate	Merge branch 'catalog'	2011-10-21 17:55:41 +03:00
schema.rb	Merge branch 'catalog'	2011-10-21 17:55:41 +03:00
seeds.rb	Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858	2011-10-19 23:58:31 +03:00