Merge remote-tracking branch 'origin/develop' into develop

Browse Source

# Conflicts:
#	Calendar/Models/CalendarMapper.php

...

This commit is contained in:

Dennis Eichhorn 2016-04-22 17:46:31 +02:00

parent ea20567ec1 7b4d08bccc

commit 7b8dfd81ea

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 Not Available