• P. J. McDermott's avatar
    Merge branch 'master' into code-cleanup · 11c3f35b
    P. J. McDermott authored
    Conflicts:
    	nixtape/artist-manage.php
    	nixtape/artist-tag.php
    	nixtape/artist.php
    	nixtape/data/Album.php
    	nixtape/data/Group.php
    	nixtape/data/Server.php
    	nixtape/login.php
    	nixtape/radio/radio-utils.php
    	nixtape/register.php
    	nixtape/templating.php
    	nixtape/user-profile.php
    	nixtape/user-recommended.php
    	nixtape/user-station.php
    	nixtape/user-stats.php
    11c3f35b
artist-manage.php 2.92 KB