Merge "Move assets/ to resources/assets/"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 17 Sep 2014 23:02:35 +0000 (23:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Sep 2014 23:02:35 +0000 (23:02 +0000)
commit62f886311aa22773963e94039a82d5556c2154c6
tree056384ccf7be41518d518e0685beb1a82d2829c7
parent898c6e3d1447d3d9d91eb209fedbe87235075286
parent1cf5a6e9d3cc9239ed64f7d12ba5cf47ee1d331c
Merge "Move assets/ to resources/assets/"