• mmn's avatar
    Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes · 980085a8
    mmn authored
    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
    980085a8
Name
Last commit
Last update
..
extlib Loading commit data...
emailsettings.js Loading commit data...
identica-badge.js Loading commit data...
install.js Loading commit data...
jcrop.go.js Loading commit data...
util.js Loading commit data...
xbImportNode.js Loading commit data...