Commit 30d9f9c8b343e559bdf2edc82f42dc4a8df15af6

  • Tree SHA1: 96d8ae1
  • Parent SHA1: 06f9ca0 (Editor UI - with cutom oprions - label, tags, links)
  • Parent SHA1: 5d1fcf2 (Changing 'GO' to 'Load') 
Merge branch 'master' of git.pantoto.org:sweet-web/swtr

Conflicts:
	swtr/static/js/swtmaker.js