Mikael Nordfeldth 95d415257a 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!

2016-01-03 13:08:34 +01:00

..

Happening.php

RSVPs refer to Happening (event) by URI instead of ID now

2015-12-31 19:23:05 +01:00

RSVP.php

Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

2016-01-03 13:08:34 +01:00