]> git.mxchange.org Git - friendica.git/commit
Merge event-attendance into develop
authorrabuzarus <trebor@central-unit>
Sun, 11 Oct 2015 17:28:54 +0000 (19:28 +0200)
committerrabuzarus <trebor@central-unit>
Sun, 11 Oct 2015 17:28:54 +0000 (19:28 +0200)
commitdb7dca3d5f7416cfb5378bbfa10cf87924108a0e
treec3db8548b0008c8e8cee68cf411d2abf07836dfc
parenta539455d813d99c5737ed4fa2e868278978fbf8b
parenta539455d813d99c5737ed4fa2e868278978fbf8b
Merge event-attendance into develop
Conflicts:
include/conversation.php