]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c247b17 325199b)
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 1 Mar 2015 17:30:18 +0000 (18:30 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 1 Mar 2015 17:30:18 +0000 (18:30 +0100)
commit1e5232502571dcb1e8f107b9d27c54d91f0b8692
tree145c9cd87661c210055e82c8afd1d004d28ff2bdtree | snapshot
parentc247b175fba18d0aeabf2585a477538e6857c1a9commit | diff
parent325199b5e68f413e96eabc7a293089f5c748e9cecommit | diff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly

Conflicts:
plugins/Blog/BlogPlugin.php
plugins/Blog/classes/Blog_entry.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)