Commit graph

4 commits

Author SHA1 Message Date
f1d21df5d8 Merge branch 'master' of GitHub repo
Conflicts:
	src/buttondevteam/website/ButtonWebsiteModule.java
	src/buttondevteam/website/WebUser.java
2017-11-23 23:31:39 +01:00
f67d886000 Fixes, changed to port 443, more fixes
Aaand I forgot to pull the master branch
2017-11-23 23:25:56 +01:00
2aa02a34cb Applied changes 2017-06-30 18:21:03 +02:00
fc39cf6d6a Fixed access rules, added WebUser, login 2017-06-13 22:18:08 +02:00