Vladimir Krylov 4bbebe8ad6 Merge branch '108869472-objects_archive' into staging ... # Conflicts: # app/views/admin/domain_versions/show.haml		2016-06-10 14:09:52 +03:00
..
admin	Merge branch '108869472-objects_archive' into staging	2016-06-10 14:09:52 +03:00
epp	118827161-emty_block_remove	2016-05-19 18:13:22 +03:00
for_models	111297422-whitespaces	2016-01-13 15:54:30 +02:00
kaminari/admin	108869472-pagination_modification	2016-04-29 14:18:44 +03:00
layouts	Merge branch 'master' into story/115762063-show-historical-nested	2016-05-18 16:48:14 +03:00
mailers	Updated automated email notification messages.	2016-05-26 14:10:26 +03:00
registrant	Story#120182999 - Registrant: message to login screen about Estonian ID requirement.	2016-06-06 13:05:49 +03:00
registrar	118007975-style_changes	2016-05-30 18:01:01 +03:00
shared	Story#105855968 - admin/show mark if registrar is test	2016-03-21 12:18:48 +02:00