Vladimir Krylov fd9fca741a Merge remote-tracking branch 'origin/master' into 111396946-blocked_and_reserved_view2 ... # Conflicts: # app/controllers/admin/blocked_domains_controller.rb # app/models/blocked_domain.rb		2016-02-10 11:10:49 +02:00
..
devise.en.yml	Basic login	2014-09-25 13:12:44 +03:00
en.yml	Merge remote-tracking branch 'origin/master' into 111396946-blocked_and_reserved_view2	2016-02-10 11:10:49 +02:00
et.yml	Estonian translation update #2558	2015-06-03 10:42:50 +03:00