tedkulp/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2026-04-18 21:48:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into attachment-handling

Browse Source 
# Conflicts:
#	js/privatebin.js
#	tpl/bootstrap.php
#	tpl/page.php
This commit is contained in:
thororm
2017-04-02 13:30:52 +02:00
parent b9737d368d f25ea35666
commit 096f07f86e
60 changed files with 4651 additions and 2100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cfg/.gitignore
-1
View File
@@ -1 +0,0 @@
/conf.ini
cfg/.htaccess
+1 -2
View File
@@ -1,2 +1 @@
Allow from none
Deny from all
Require all denied