Merge branch 'feature_settings_restricted_to_settingsbases'

This commit is contained in:
Tim Kuipers 2016-06-09 13:11:30 +02:00
commit b3cfa62775
4 changed files with 580 additions and 263 deletions

File diff suppressed because it is too large Load diff