Mikael Nordfeldth
980085a8a3
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
2016-03-21 03:10:19 +01:00
..
2016-02-07 01:52:20 +01:00
2016-01-13 14:17:49 +01:00
2015-06-06 16:02:25 +02:00
2010-10-08 10:42:59 -07:00
2016-01-14 13:06:37 +01:00
2013-08-21 11:25:08 +02:00
2016-03-20 13:06:58 +00:00
2016-01-16 17:18:14 +01:00
2016-01-29 16:06:16 +01:00
2013-11-01 13:20:45 +01:00
2015-10-21 01:50:03 +00:00
2015-10-04 17:26:23 +02:00
2016-03-15 16:53:19 +01:00
2016-01-14 01:51:00 +01:00