-
Patrick Barroca authored
Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master Conflicts: VERSIONS library/Class/Users.php library/startup.php
a24e1057
Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master Conflicts: VERSIONS library/Class/Users.php library/startup.php