Vladimir Krylov 4f458adb0f Merge branch 'story/105855968-directo' into staging ... # Conflicts: # config/locales/en.yml		2016-03-21 12:20:33 +02:00
..
devise.en.yml	Basic login	2014-09-25 13:12:44 +03:00
en.yml	Merge branch 'story/105855968-directo' into staging	2016-03-21 12:20:33 +02:00
et.yml	Estonian translation update #2558	2015-06-03 10:42:50 +03:00