Pavel Chipiga cf907c19e8 Merge branch 'master' into 263-refactoring ... Conflicts: app/controllers/build_lists_controller.rb		2012-04-24 19:06:43 +03:00
..
core	Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134	2012-03-22 19:11:12 +02:00
git	Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263	2012-03-29 23:34:22 +03:00
rails	Merge branch 'master' into 263-refactoring	2012-04-24 19:06:43 +03:00
paperclip.rb	Add magic encodings. Refs #95	2012-01-30 22:39:34 +02:00
preregistration.rb	Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263	2012-03-29 23:34:22 +03:00