projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06aa05a ee23dc8)
Merge branch 'social-master' into nightly
authorRoland Haeder <roland@mxchange.org>
Sat, 7 Mar 2015 18:31:47 +0000 (19:31 +0100)
committerRoland Haeder <roland@mxchange.org>
Sat, 7 Mar 2015 18:31:47 +0000 (19:31 +0100)
commitaa4f00a0681539d3f289b3989a10e3e625931df6
treee6f8805bf19949dd30d6331c0c92dfc68b8754batree | snapshot
parent06aa05aa48d4108909e4c25e267587f7bc90189fcommit | diff
parentee23dc8ccfea2fec1c8061b0e7de52cc2aa42864commit | diff
Merge branch 'social-master' into nightly

Conflicts:
lib/noticeform.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. :-)