]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - lib/language.php
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f9a4728 cc71f1a)
Merge branch 'activityhooks' into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:01:18 +0000 (16:01 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 23:01:18 +0000 (16:01 -0700)
commit2ba36fc2428ed41d74e123d49de38accc48415e3
tree9665cc9b92b7ebed255ceeb87f82efe460548edctree | snapshot
parentf9a4728fcc5d93a019bc72f44c836fa51c2e8ea7commit | diff
parentcc71f1ae826cc7c186f38ac902d963dc8f65caebcommit | diff
Merge branch 'activityhooks' into 0.9.x

Conflicts:
classes/Notice.php
classes/Notice.php diff1 | diff2 | blob | history
classes/Profile.php diff1 | diff2 | blob | history
plugins/OStatus/OStatusPlugin.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. :-)