Merge branch 'master' into 'Localhost_files'
# Conflicts: # api/authenticate.php # api/changeTheme.php # api/logout.php # api/register_user.php # api/storeImg.php # models/db.php # views/uploadButton.php
No related branches found
No related tags found
Showing
- api/authenticate.php 1 addition, 0 deletionsapi/authenticate.php
- api/changeTheme.php 4 additions, 5 deletionsapi/changeTheme.php
- api/logout.php 4 additions, 0 deletionsapi/logout.php
- api/register_user.php 4 additions, 5 deletionsapi/register_user.php
- api/storeImg.php 4 additions, 0 deletionsapi/storeImg.php
- assets/fanart/.gitkeep 0 additions, 0 deletionsassets/fanart/.gitkeep
- models/db.php 4 additions, 5 deletionsmodels/db.php
assets/fanart/.gitkeep
0 → 100644
Please register or sign in to comment