]> git.parisson.com Git - diggersdigest.git/commit
Merge branch 'master' of git.parisson.com:git/diggersdigest
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 11 Sep 2015 13:29:04 +0000 (15:29 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 11 Sep 2015 13:29:04 +0000 (15:29 +0200)
commita5d446b9c8d3812cce514862936a26a7706a7637
tree1155d196ab0eab22b5e0efd015230d39671ad676
parent8ecb708567422dce5d1dfb94ed43e2face777c1c
parent7a937e2aaccd79c2da69554ca30f86c1b958c3ad
Merge branch 'master' of git.parisson.com:git/diggersdigest

Conflicts:
diggersdigest/templates/base.html
diggersdigest/templates/base.html