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
..
form	Revert "Story #104525314 - admin is not allowed to reject pendingDeleteConfirmation"	2015-11-23 09:14:49 +02:00
partials	Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested	2016-03-22 23:51:21 +02:00
_form.haml	Contact/Domain statuses admin interface refactored #2785	2015-08-12 00:43:34 +03:00
edit.haml	Moved force delete button under statuses #2785	2015-08-12 00:43:34 +03:00
index.haml	Add result count #2122	2015-07-30 18:14:05 +03:00
show.haml	Moved force delete button under statuses #2785	2015-08-12 00:43:34 +03:00
versions.haml	Merge remote-tracking branch 'origin/108869472-objects_archive' into story/115762063--show-historical-nested	2016-03-22 23:51:21 +02:00
zonefile.haml	Refatored to use shared/title partial	2015-04-16 16:31:22 +03:00