Merge branch 'master' of https://github.com/elrido/ZeroBin

Conflicts:
	cfg/conf.ini
	js/zerobin.js

cfg/conf.ini

@@ -5,23 +5,33 @@
 ; @link      http://sebsauvage.net/wiki/doku.php?id=php:zerobin
 ; @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
 ; @license   http://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
-; @version   0.18
+; @version   0.19
 
 [main]
-; enable or disable discussions
-opendiscussion = false
+; enable or disable discussions, defaults to true
+opendiscussion = true
 
-; enable or disable syntax highlighting
-syntaxhighlighting = false
+; enable or disable syntax highlighting, defaults to true
+syntaxhighlighting = true
 
-; preselect the burn-after-reading feature by default
+; (optional) set a syntax highlighting theme, as found in css/prettify/
+; syntaxhighlightingtheme = "sons-of-obsidian"
+
+; preselect the burn-after-reading feature, defaults to false
 burnafterreadingselected = false
 
-; size limit per paste or comment in bytes, default is 2 Mibibytes
+; size limit per paste or comment in bytes, defaults to 2 Mibibytes
 sizelimit = 2097152
 
-; template to include, default is "page" (tpl/page.html)
-template = "page"
+; template to include, default is "bootstrap" (tpl/bootstrap.html)
+template = "bootstrap"
+
+; (optional) notice to display
+; notice = "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service."
+
+; base64.js library version, defaults to 2.1.9
+; use "1.7" if you are upgrading from a ZeroBin Alpha 0.19 installation
+base64version = "2.1.9"
 
 [expire]
 ; expire value that is selected per default