6 Commits (631106f40147c09c7ec9331ec1ad3cb5ab18fe5c)

Author	SHA1	Message	Date
Theunis Johannes Botha	631106f401	merge conflicts	2018-04-04 12:34:57 +02:00
Theunis Johannes Botha	aea2bc34a0	stuff	2018-04-04 12:30:30 +02:00
-=yb4f310	5b347466a5	stuff	2017-10-02 12:02:07 +02:00
-=yb4f310	3eda8f5eb1	general encrypted	2017-04-03 19:00:56 +02:00
Theunis Johannes Botha	8bfeddfab6	cybafelo config	2017-02-09 00:50:43 +01:00
Theunis J. Botha	14f4e16960	config updates	2017-01-26 18:49:30 +01:00