Merge event-attendance into develop

Browse source

Conflicts:
	include/conversation.php

...

This commit is contained in:

rabuzarus 2015-10-11 19:28:54 +02:00

parent a539455d81 a539455d81

commit db7dca3d5f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available