error messages
merge error
servre file update
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'AndrewServer' of https://github.com/TheDizzler/space-union into AndrewServer
merging
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
merging
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
added transmitter project
Added functionality so that a user is able to change their avatar and a users blocked status can be changed
changed function description for blocked user query and change user image query
Added functionality to allow a user to change their password
fix problem where other users would be able to change others avatars
Merge branch 'MikhailServer' of https://github.com/TheDizzler/space-union into AndrewServer
Merge branch 'AndrewServer' of https://github.com/TheDizzler/space-union into AndrewServer
edited queries to prevent troy from using sql injections to destroy the database
Merge branch 'database_robert' of https://github.com/TheDizzler/space-union into AndrewServer