]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1bcc79 2a70ed2)
Merge remote-tracking branch 'statusnet/master'
authorMikael Nordfeldth <mmn@hethane.se>
Mon, 12 Aug 2013 10:23:17 +0000 (12:23 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Mon, 12 Aug 2013 10:23:17 +0000 (12:23 +0200)
commitf79aec36feaa4760201a7e88d5b31513a3c458ba
tree7ce9341d5107a661c76cb703a763ded6cc015c5etree | snapshot
parenta1bcc79bca798b6f10b1f5004f846a55708c548acommit | diff
parent2a70ed27e71e2e6e88359c88229d9c9ac5bb91a0commit | diff
Merge remote-tracking branch 'statusnet/master'

This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.

Conflicts:
doc-src/about
doc-src/faq
plugins/OpenID/doc-src/openid
lib/action.php diff1 | diff2 | blob | history
locale/ca/LC_MESSAGES/statusnet.po diff1 | diff2 | blob | history
plugins/OStatus/actions/ostatusinit.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. :-)