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

..

.htaccess

Fixed bug with missing directory separator and added .htaccess files to lib & cfg directories. If those are not present, the application will create them for you.

2012-04-30 13:58:29 +02:00

conf.ini

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

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