Merge branch 'master' of https://notabug.org/RemixDev/deemix

2020-05-10 15:02:05 +02:00 · 2020-05-10 15:02:05 +02:00 · 05b940b84f
parent 0f47c61c5f ae07e5d71f
commit 05b940b84f
1 changed files with 4 additions and 0 deletions
--- a/public/index.html
+++ b/public/index.html
@ -307,7 +307,11 @@ <h3 class="section_heading">Most streamed albums</h3>
 													class="material-icons">get_app</i></div>
 										</div>
 										<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>
+>>>>>>> b1d931b75e62f341f7ce468680175bcf1ccdc7d1
 									</div>
 								</div>
 							</section>