git.mxchange.org Git - quix0rs-gnu-social.git/commit

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

This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)

RSS Atom

author	Mikael Nordfeldth <mmn@hethane.se>
	Mon, 21 Mar 2016 02:10:19 +0000 (03:10 +0100)
committer	Mikael Nordfeldth <mmn@hethane.se>
	Mon, 21 Mar 2016 02:10:19 +0000 (03:10 +0100)
commit	980085a8a32e3e617c99f670e6cc4755b91ba5be
tree	e8b54a5728637a1ff3f10356504a9e16248f6a17	tree \| snapshot
parent	50a10cf1615fab6c4fefc397e7637d9a19d0278c	commit \| diff
parent	43178dfe1071799e95e8d59a0b6f203fbe83d0dd	commit \| diff

CONFIGURE	diff1 \|	diff2 \|	blob \| history
lib/action.php	diff1 \|	diff2 \|	blob \| history
plugins/BitlyUrl/BitlyUrlPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Mapstraction/MapstractionPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php	diff1 \|	diff2 \|	blob \| history
plugins/Sitemap/SitemapPlugin.php	diff1 \|	diff2 \|	blob \| history