Commit Graph
2 Commits
Author SHA1 Message Date
AngristanandGitHub dcec3f12a4 Disable firewalld to allow iptables to start upon reboot 2017-11-12 18:30:05 +01:00
AngristanandGitHub ed17fc074d Resolve conflicts
Merge changes from master to resolve conflicts
2017-11-12 18:07:07 +01:00