diff options
| author | msquare <msquare@notrademark.de> | 2016-11-15 15:35:55 +0100 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2016-11-15 15:35:55 +0100 |
| commit | 3873b8dc6113aa465159ff62ffd59dc22479fa3c (patch) | |
| tree | 0a6f7228d400f950a345df2f91f44d65fa7eaafb /includes/model/Room_model.php | |
| parent | 16ed2ae68381362cbfe66d10226b9dedbfaacba5 (diff) | |
| parent | 852f17a535815cf0d01b13f1ef577b1387cfc5f9 (diff) | |
Merge branch 'pr/276'
# Conflicts:
# locale/de_DE.UTF-8/LC_MESSAGES/default.mo
# locale/de_DE.UTF-8/LC_MESSAGES/default.po
Diffstat (limited to 'includes/model/Room_model.php')
0 files changed, 0 insertions, 0 deletions