[tor-commits] [webwml/master] Merge branch 'minify' into staging

hiro at torproject.org hiro at torproject.org
Mon Jul 3 07:57:09 UTC 2017


commit bab9278a84fa3ed85258301c143c70a9301f0da2
Merge: 2781bc9 9ecbc33
Author: hiromipaw <hiro at torproject.org>
Date:   Mon Jul 3 09:06:18 2017 +0200

    Merge branch 'minify' into staging

 css/bootstrap.min.css               |  5 +++++
 css/donate-style.min.css            |  1 +
 css/ie6.min.css                     |  1 +
 css/ie7-and-down.min.css            |  1 +
 css/ie8-and-down.min.css            |  1 +
 css/layout-rtl.min.css              |  1 +
 css/layout.min.css                  |  1 +
 css/master-rtl.min.css              |  1 +
 css/master.min.css                  |  1 +
 css/reset.min.css                   |  1 +
 css/tbbproject.min.css              |  1 +
 css/thankyou.min.css                |  1 +
 css/typography-rtl.min.css          |  1 +
 css/typography.min.css              |  1 +
 docs/torbutton/en/index.wml         |  2 +-
 include/dlhead.wmi                  | 14 +++++++-------
 include/donatehead.wmi              |  6 +++---
 include/head.wmi                    | 10 +++++-----
 include/thankyou-head.wmi           | 12 ++++++------
 js/animate.min.js                   |  1 +
 js/dlpage01.min.js                  |  1 +
 js/functions.min.js                 |  1 +
 js/jquery-migrate-1.0.0.min.js      |  6 ++++++
 po2wml.sh                           | 38 ++++++++++++++++++-------------------
 projects/en/tbb-head.wmi            | 32 +++++++++++++++----------------
 rule-41/banner.html                 | 10 +++++-----
 rule-41/css/actions.min.css         |  1 +
 rule-41/css/call-email-tool.min.css |  1 +
 rule-41/email.html                  |  4 ++--
 rule-41/js/css3-mediaqueries.min.js |  1 +
 rule-41/js/html5.min.js             |  1 +
 rule-41/js/international.min.js     |  1 +
 rule-41/js/main.min.js              |  1 +
 rule-41/petition.html               |  4 ++--
 34 files changed, 99 insertions(+), 66 deletions(-)





More information about the tor-commits mailing list