0
Commit Graph

2 Commits

Author SHA1 Message Date
Carter Charbonneau
2003267f35 optimize the images used in the UI an otherwise bundled 2012-01-11 22:35:01 -07:00
Aaron Griffith
383b01859f Merge branch 'master' into py-package
Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css
2011-05-10 20:19:10 -04:00