projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e1a6a6 0dc7fcc)
Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 3 Jan 2016 12:08:34 +0000 (13:08 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 3 Jan 2016 12:08:34 +0000 (13:08 +0100)
commit95d415257a43d5d4338ce22089463c1820b6bf8b
treec0cacc6f846292a9a7757e72086b22fbdcbdc0e2tree | snapshot
parent3e1a6a65e65e0f5a051e39b3b792b53e1cc358cbcommit | diff
parent0dc7fcce5b19d0ab3b489dda48d1d8aeeb29378acommit | diff
Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

Conflicts:
plugins/Event/EventPlugin.php
plugins/Event/classes/RSVP.php

I just fixed 'em with magic!
plugins/Event/EventPlugin.php diff1 | diff2 | blob | history
plugins/Event/classes/RSVP.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. :-)