]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac8070e 15d8f97)
Merge branch 'rewrites-master/type-hints-asserts' into rewrites-nightly/type-hints... rewrites-nightly/type-hints-asserts
authorRoland Haeder <roland@mxchange.org>
Fri, 27 Mar 2015 21:24:37 +0000 (22:24 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 27 Mar 2015 21:24:37 +0000 (22:24 +0100)
commit6a37106003808d1ded8adcd117dca1f561be7fb8
tree2bf62d5cd42b23e913db28db6582bde23819dd33tree | snapshot
parentac8070e00b0ed9999134304c4d4afaa068c422c2commit | diff
parent15d8f97fd97cc8c0290f124b9485bec5e52a82fbcommit | diff
Merge branch 'rewrites-master/type-hints-asserts' into rewrites-nightly/type-hints-asserts

Conflicts:
classes/Notice.php
lib/docfile.php
lib/framework.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
actions/invite.php diff1 | diff2 | blob | history
actions/replies.php diff1 | diff2 | blob | history
classes/Notice.php diff1 | diff2 | blob | history
lib/docfile.php diff1 | diff2 | blob | history
lib/framework.php diff1 | diff2 | blob | history
plugins/Favorite/classes/Fave.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. :-)