aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2016-08-29 13:55:28 +0200
committerplegall <plg@piwigo.org>2016-08-29 13:55:28 +0200
commitba627eeca83ab5090e996ae7033c8c1656c23255 (patch)
tree17b378cf91be4ac1990b86e73d2e8573370dc007 /themes
parent80f552389267d97d667259b030bbcc1a2a29b7d3 (diff)
parent10da5801ef728056a63388da74860ed9ef624730 (diff)
Merge branch 2.8, which is a "fake" merge
git merge -s ours 2.8 : to avoid merging version number change
Diffstat (limited to 'themes')
0 files changed, 0 insertions, 0 deletions