Oliver Gorwits 20f4704fe2 Merge branch 'master' into og-api-tokens-simple

2019-03-15 12:31:52 +00:00

..

environments

also update default config for new discover_phones and discover_waps settings

2019-03-03 12:32:07 +00:00

public

Revert "workaround for #457 (#465)"

2018-12-28 16:50:22 +00:00

schema_versions

Merge branch 'master' into og-api-tokens-simple

2019-03-11 17:55:31 +00:00

swagger-ui

update version of swagger-ui to 3.20.3

2018-12-31 19:56:10 +00:00

views

i think end anchor should be in the if clause (#493)

2019-01-26 22:09:55 +00:00

config.yml

Merge branch 'master' into og-api-tokens-simple

2019-03-15 12:31:52 +00:00