Conversation
Notices
-
Quix0r's GNUSocial Clone (quix0rsgnusocial)'s status on Sunday, 01-Mar-2015 19:30:04 CET Quix0r's GNUSocial Clone In social/quix0rs-gnu-social.git:nightly
Commit: 1e5232502571dcb1e8f107b9d27c54d91f0b8692
Date: 2015-03-01 17:30
Author: Roland Haeder
Committer: Roland Haeder
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>
tag:gitorious.org,2005:Grit::Commit/1e5232502571dcb1e8f107b9d27c54d91f0b8692