Merge branch 'master' of https://notabug.org/RemixDev/deemix
This commit is contained in:
commit
05b940b84f
@ -307,7 +307,11 @@ <h3 class="section_heading">Most streamed albums</h3>
|
|||||||
class="material-icons">get_app</i></div>
|
class="material-icons">get_app</i></div>
|
||||||
</div>
|
</div>
|
||||||
<p class="primary-text">{{ release.title }}</p>
|
<p class="primary-text">{{ release.title }}</p>
|
||||||
|
<<<<<<< HEAD
|
||||||
<p class="secondary-text">{{ 'by '+release.artist.name }}</p>
|
<p class="secondary-text">{{ 'by '+release.artist.name }}</p>
|
||||||
|
=======
|
||||||
|
<p class="secondary-text">{{ 'by '+release.artist.name+' }}</p>
|
||||||
|
>>>>>>> b1d931b75e62f341f7ce468680175bcf1ccdc7d1
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
Loading…
Reference in New Issue
Block a user