resolve merge conflict
[wakeup.git] / web /
2020-02-02 Arjen BaartMerge conflict in .gitignore
2020-02-02 Arjen BaartSimple web interface
2019-12-26 Arjen BaartInitial revision