From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 21 Mar 2016 02:10:19 +0000 (+0100)
Subject: Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=980085a8a32e3e617c99f670e6cc4755b91ba5be;p=quix0rs-gnu-social.git

Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes

Conflicts:
	plugins/Minify/extlib/minify/README.txt
	plugins/Minify/extlib/minify/UPGRADING.txt
	plugins/Minify/extlib/minify/min/README.txt
	plugins/Minify/extlib/minify/min/builder/index.php
	plugins/Minify/extlib/minify/min/lib/JSMin.php
	plugins/Minify/extlib/minify/min/lib/Minify.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php
	plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php
	plugins/Minify/extlib/minify/min/lib/Minify/Packer.php
	plugins/Recaptcha/RecaptchaPlugin.php
---

980085a8a32e3e617c99f670e6cc4755b91ba5be