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

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

2015-08-30 14:33:09 +02:00

..

base64-1.7.js

updated base64.js to version 2.1.9, using minified version found at

2015-08-16 12:27:06 +02:00

base64-2.1.9.js

updated base64.js to version 2.1.9, using minified version found at

2015-08-16 12:27:06 +02:00

bootstrap-3.3.5.js

added a bootstrap theme, still needs some work in the comments layout

2015-08-17 23:19:15 +02:00

jquery-1.11.3.js

updated base64.js to version 2.1.9, using minified version found at

2015-08-16 12:27:06 +02:00

prettify.js

updated prettify to minified versions found at

2015-08-16 12:46:01 +02:00

rawdeflate-0.5.js

updated de/inflate to versions 0.5/0.3, using versions found at

2015-08-16 13:02:27 +02:00

rawinflate-0.3.js

updated de/inflate to versions 0.5/0.3, using versions found at

2015-08-16 13:02:27 +02:00

sjcl-1.0.2.js

updated base64.js to version 2.1.9, using minified version found at

2015-08-16 12:27:06 +02:00

zerobin.js

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

2015-08-30 14:33:09 +02:00