]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3bdb80a abd90bb)
Merge branch 'master' into social-master
authorRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:12:00 +0000 (03:12 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 01:12:00 +0000 (03:12 +0200)
commitaa23e565ef6660981d4f5ab65813313aa1cad475
treed3acf26f6996f324d3706509aa4b1edb4c12a975tree | snapshot
parent3bdb80a182b0fca7840d097be628a29a56e0c542commit | diff
parentabd90bbdf562614755802885dfb5673645df8575commit | diff
Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/replies.php
classes/Notice.php
lib/noticeform.php
plugins/WebFinger/WebFingerPlugin.php
plugins/WebFinger/WebFingerPlugin.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. :-)