diff options
author | Andreas Hubel | 2016-06-11 11:39:21 +0200 |
---|---|---|
committer | Andreas Hubel | 2016-06-11 11:39:21 +0200 |
commit | 5dcba7adfff664ebb54191417fd760297b0b0a0f (patch) | |
tree | 07bdf7f4e4a151d115ca14d58ed5c89ac612b660 /model/Conference.php | |
parent | 88f4b2781688769b3ba29a348074929714edb9c4 (diff) | |
parent | 5a52afb0b28441cf1fb489a8ff36fb309e74bf33 (diff) |
Merge branch 'jh-sued-2016' into events/jh16
Diffstat (limited to 'model/Conference.php')
0 files changed, 0 insertions, 0 deletions