Merge branch 'master' into limit-actions
commit65298a7e627bf154b3b2023b41f930388f53f7e5
authorStefan Kögl <stefan@skoegl.net>
Thu, 1 Feb 2018 14:15:07 +0000 (1 15:15 +0100)
committerStefan Kögl <stefan@skoegl.net>
Thu, 1 Feb 2018 14:15:07 +0000 (1 15:15 +0100)
tree7528ae07d7dca11c582bfad5f80ddc321af120e3
parenta3d7b7be2e9b2b26082ad89c87cb2b0311a80886
parent09a97b186eae24101000818cf99f55fd33e725fd
Merge branch 'master' into limit-actions
doc/dev/configuration.rst
mygpo/api/advanced/__init__.py
mygpo/api/tests.py
mygpo/settings.py