Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring ... Conflicts: Gemfile Gemfile.lock config/routes.rb		2012-04-23 17:58:45 +03:00
..
migrate	[refs #396] fixing rollback	2012-04-20 22:51:12 +06:00
schema.rb	Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263	2012-04-19 22:45:50 +03:00
seeds.rb	[Refs #263] Delete Categories	2012-03-29 23:01:25 +04:00