Merge remote-tracking branch 'matrix-org/master' into travis/s2s/transactions-swagger

This commit is contained in:
Travis Ralston 2018-07-24 09:15:36 -06:00
commit cb4fcd1d09
15 changed files with 895 additions and 518 deletions

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# dump-swagger reads all of the swagger API docs used in spec generation and
# outputs a JSON file which merges them all, for use as input to a swagger UI