]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d2898e 286b54e)
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:14 +0000 (14:52 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 4 Mar 2015 13:52:14 +0000 (14:52 +0100)
commit5ba2bf0c57ae6d2dc6f485012dcf34d4616ef9c7
tree622a3fa6f3e55b6044d878952b5680a9bcdbc900tree | snapshot
parent5d2898eb82940bc92fd061fa12d3daf51678efbccommit | diff
parent286b54e5274afe5b26b873ec66909afc2bb3334bcommit | diff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
classes/File.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
actions/invite.php diff1 | diff2 | blob | history
actions/subscribe.php diff1 | diff2 | blob | history
classes/File.php diff1 | diff2 | blob | history
classes/File_thumbnail.php diff1 | diff2 | blob | history
lib/activityimporter.php diff1 | diff2 | blob | history
lib/imagefile.php diff1 | diff2 | blob | history
plugins/Bookmark/BookmarkPlugin.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. :-)