xithical c20ffb522d Merge branch 'dev' into 'xithical' ... # Conflicts: # app/classes/shared/server.py		2021-08-18 23:30:45 +00:00
..
minecraft	Sort server types, I suffered a lot while doing this	2021-06-02 21:17:50 +03:00
shared	Merge branch 'dev' into 'xithical'	2021-08-18 23:30:45 +00:00
web	Moved delete server to ajax call instead of a task.	2021-08-18 18:50:53 -04:00