Vladimir Krylov fe930c7535 Merge branch '104525318-history_import' into staging ... # Conflicts: # Gemfile # app/models/domain.rb # config/locales/en.yml		2016-03-04 14:48:41 +02:00
..
devise.en.yml	Basic login	2014-09-25 13:12:44 +03:00
en.yml	Merge branch '104525318-history_import' into staging	2016-03-04 14:48:41 +02:00
et.yml	Estonian translation update #2558	2015-06-03 10:42:50 +03:00