Tobi Schäfer cdc6f5db07 Merge branch 'develop' into feature/wysiwyg-editor ... * develop: Added comment about why including main CSS file does not work Moved renderPage() method down in code Fixed bug causing error when trying to delete a comment (see e-mail from kinomu, 22 Feb 2015 19:20:15 – trinity-4365fa39-f3f6-407b-a241-18f3c180b59e-1424629215534@3capp-gmx-bs61) Fixed source map URLs Conflicts: build.xml code/Site/Site.js static/scripts/cm.min.js static/scripts/main.min.js static/styles/main.min.css		2015-03-14 19:56:46 +01:00
..
fonts	Implemented first version of working WYSIWYG story editor	2015-03-07 12:28:05 +01:00
img	Increased size for high resolution displays	2015-02-21 19:24:09 +01:00
scripts	Merge branch 'develop' into feature/wysiwyg-editor	2015-03-14 19:56:46 +01:00
styles	Implemented first version of working WYSIWYG story editor	2015-03-07 12:28:05 +01:00
formica.html	Restored missing commit for sprite images	2015-01-23 18:36:05 +01:00