Vladimir Krylov ffe2ddd02c Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested ... # Conflicts: # app/views/admin/domain_versions/_version.haml # app/views/admin/domain_versions/index.haml		2016-03-22 23:51:21 +02:00
..
admin	Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested	2016-03-22 23:51:21 +02:00
epp	Story #110211760 - ensure that upDate is not shown when domain has not changed since creation	2015-12-17 11:27:06 +02:00
for_models	111297422-whitespaces	2016-01-13 15:54:30 +02:00
layouts	108869472-templates	2015-12-11 10:58:33 +02:00
mailers	111068694-template_changes	2016-01-07 19:08:49 +02:00
registrant	Story#105842700 - show titles in registrant's domain, contact and contact name	2016-03-21 14:01:50 +02:00
registrar	Story#113524121 - we have new rails, so we should use data-legal-document	2016-03-07 12:23:19 +02:00
shared	Admin contact statuses management #2477	2015-07-22 13:37:30 +03:00