Dmitriy Zaporozhets c3cf32e863 Merge branch 'version-check' into gl-version-check ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb		2015-05-08 16:05:00 +03:00
..
fixtures	Fix user fixtures for development	2015-03-08 17:35:49 -07:00
migrate	Merge branch 'version-check' into gl-version-check	2015-05-08 16:05:00 +03:00
schema.rb	Merge branch 'version-check' into gl-version-check	2015-05-08 16:05:00 +03:00
seeds.rb	…