projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd93420 771f08b)
Merge remote-tracking branch 'upstream/master' into social-master
authorRoland Haeder <roland@mxchange.org>
Sat, 30 Jan 2016 12:38:52 +0000 (13:38 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 30 Jan 2016 12:38:52 +0000 (13:38 +0100)
1  2 
classes/Notice.php patch | diff1 | diff2 | blob | history

diff --cc classes/Notice.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)