]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9102429 9a8ccba)
Merge commit 'refs/merge-requests/45' of https://gitorious.org/social/mainline into...
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 14 Feb 2015 15:45:04 +0000 (16:45 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 14 Feb 2015 15:45:04 +0000 (16:45 +0100)
1  2 
EVENTS.txt patch | diff1 | diff2 | blob | history

diff --cc EVENTS.txt
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)