Artur Beljajev 62fbeadf34 Merge branch 'master' into improve-registrar-access-denied-page ... # Conflicts: # config/locales/en.yml		2017-10-09 02:14:22 +03:00
..
admin	Move setting types from controller to model	2017-08-23 01:24:01 +03:00
epp	Revert "Registry 569"	2017-10-05 16:08:47 +03:00
registrar	Improve test readability	2017-10-04 20:29:08 +03:00