]> git.parisson.com Git - teleforma.git/commit
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 9 Oct 2018 07:52:33 +0000 (09:52 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 9 Oct 2018 07:52:33 +0000 (09:52 +0200)
commit9d5c03164f160a22a1a82adf734a900063122206
tree4760ffc4df5a71acb709dfb8ad2f6f3937925bed
parent876ea7f61699f4ac6cebe289441e5c2b614b0503
parentb806880c8697da4abc7d7d539b207a57f5cca6c2
Merge branch 'master' of git.parisson.com:git/teleforma

Conflicts:
teleforma/templates/teleforma/inc/newsitems_portlet.html
teleforma/templates/teleforma/inc/newsitems_portlet.html