]> 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: 4e65601 6be34f1)
Merge branch 'rewrites-nightly/type-hints-asserts' into nightly
authorRoland Haeder <roland@mxchange.org>
Thu, 26 Feb 2015 00:21:27 +0000 (01:21 +0100)
committerRoland Haeder <roland@mxchange.org>
Thu, 26 Feb 2015 00:21:27 +0000 (01:21 +0100)
Conflicts:
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/WebFinger/WebFingerPlugin.php

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

diff --cc classes/File.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. :-)