]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
classes/File.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
1  2 
plugins/Blog/classes/Blog_entry.php patch | diff1 | diff2 | blob | history

diff --cc plugins/Blog/classes/Blog_entry.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. :-)