7 Commits

Author	SHA1	Message	Date
DL6ER	72246d47c9	Merge branch 'devel' into fix/status	2016-12-30 20:35:43 +00:00
Promofaux	8240e2d23b	merge devel	2016-12-29 19:59:09 +00:00
DL6ER	e5a9826078	Moved more private files out of the root directory	2016-12-21 21:10:21 +01:00
DL6ER	e188cb6fbc	Revert "Merge pull request #267 from pi-hole/folderStructure" ... This reverts commit fba3d10fa4, reversing changes made to 4ee75f4167.	2016-12-21 17:16:52 +01:00
DL6ER	42c9439d1e	Merge branch 'devel' into folderStructure	2016-12-20 23:09:39 +01:00
DL6ER	34a0a57447	Merge branch 'devel' into folderStructure	2016-12-20 12:52:37 +01:00
DL6ER	bb2c2e2244	Moved more private files out of the root directory	2016-12-20 12:52:19 +01:00