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
This commit is contained in:
Vladimir Krylov 2016-03-22 23:51:21 +02:00
parent 5a582d872d
commit ffe2ddd02c
3 changed files with 50 additions and 39 deletions

View file

@ -5,7 +5,7 @@
.row
.col-md-12
.table-responsive
%table.table-hover.table-bordered.table-condensed
%table.table.table-bordered.table-condensed
%thead
%tr
%th{class: 'col-xs-1'}= t(:timestap)