]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0e32729 f345f1d)
Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Thu, 5 Nov 2015 15:16:02 +0000 (16:16 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Thu, 5 Nov 2015 15:16:02 +0000 (16:16 +0100)
commit7ccd36849e945260bb8169c816d96901e90f6a26
treed7dacbd44443c484a4515c43450aa57162ddf776tree | snapshot
parent0e32729e593a51502006bc9e9d391adb342f4272commit | diff
parentf345f1d605a02ac87a35d654d19b6f9b3b7f7d4bcommit | diff
Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly

Conflicts:
plugins/OStatus/OStatusPlugin.php

master vs. nightly thing
plugins/Favorite/FavoritePlugin.php diff1 | diff2 | blob | history
plugins/Linkback/LinkbackPlugin.php diff1 | diff2 | blob | history
plugins/OStatus/OStatusPlugin.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)