]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c641aab f8e7d42)
Merge branch 'social-master' into nightly
authorRoland Haeder <roland@mxchange.org>
Wed, 18 Feb 2015 15:48:25 +0000 (16:48 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 18 Feb 2015 15:48:25 +0000 (16:48 +0100)
commit7d9d4924cb93e6184b655040f70c7a7256b3cdfc
treee216b1c80ab281e1b1e7b9b945dce443a7a44093tree | snapshot
parentc641aabd6f1d61320054238d7b136e9c7e315064commit | diff
parentf8e7d426530e02fd10c6756668c6338a01f78a4bcommit | diff
Merge branch 'social-master' into nightly

Conflicts:
classes/File.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
plugins/Blog/classes/Blog_entry.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. :-)