laurent lepinay 326f542d04 Merge branch 'develop_2.0' into JSONEditor ...

Conflicts:
	dist/index.html
	dist/swagger-ui.js
	dist/swagger-ui.min.js

2015-03-27 02:15:29 -07:00

..

css

JSONEditor enable/disable flag

2015-03-12 07:12:07 -07:00

fonts

Normalize all the line endings

2015-03-17 14:34:22 -07:00

images

Normalize all the line endings

2015-03-17 14:34:22 -07:00

index.html

Merge branch 'develop_2.0' into JSONEditor

2015-03-27 02:15:29 -07:00

o2c.html

Oauth2 changes to support accessCode flow

2015-01-29 11:10:44 -08:00