]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb45df82a27e01993e134e517ab8f319f33366bdf
tree21d71baba3360437e71dc95cde943d8b6069c47ctree | snapshot
parent4e6560154761c2c530f24c73a821ba943618384dcommit | diff
parent6be34f1814d691023d1454aa47204f6be93d23dfcommit | diff
Merge branch 'rewrites-nightly/type-hints-asserts' into nightly

Conflicts:
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/WebFinger/WebFingerPlugin.php

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