Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/amarok

11 years ago · c57861ffc9
parent 5a0c24b410 831f48579c
commit c57861ffc9
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 38cacb89dda0605c17b203fa3a646b7f6469fd5c
+Subproject commit b6d5b675493a44e3e789cc914da0d18914d2bb39
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0953d90e24d84a91d72f741f3f8ea5791d84f41b
+Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d