commit 458a02795f004aebafa83cd7da2218984ac7c8be Merge: 38c1f31 1609c6c Author: hiromipaw hiro@torproject.org Date: Mon Jul 3 09:43:29 2017 +0200

Merge branch 'minify'

.htaccess | 4 ++-- about/en/jobs.wml | 6 +++--- css/master-rtl.css | 6 +++--- css/master-rtl.min.css | 2 +- css/master.css | 6 +++--- css/master.min.css | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-)