Laurent Lepinay 2c431d7873 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster ...

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less

2015-12-16 10:25:38 +01:00

..

css

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

2015-12-16 10:25:38 +01:00

fonts

updated font files

2015-12-09 20:37:19 -08:00

images

dist

2015-11-16 12:07:43 +01:00

lang

change fonts to use Googles Droid-Sans(-Bold).ttf

2015-11-15 07:37:08 +02:00

lib

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

2015-12-16 10:25:38 +01:00

index.html

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

2015-12-16 10:25:38 +01:00

o2c.html

fixed jshint issues

2015-04-20 10:32:33 +02:00

swagger-ui.js

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

2015-12-16 10:25:38 +01:00

swagger-ui.min.js

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

2015-12-16 10:25:38 +01:00