96bab5697d
# Conflicts: # config/version.php # database/migrations/2018_02_22_160436_add_remote_user_settings.php
# Conflicts: # config/version.php # database/migrations/2018_02_22_160436_add_remote_user_settings.php