diff options
| author | plegall <plg@piwigo.org> | 2016-07-07 18:29:30 +0200 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2016-07-07 18:29:30 +0200 |
| commit | 6932344e72fde6c6bf455a610c312139a4217ce1 (patch) | |
| tree | 2f933785ead7bfde2acf8ef5345c2dd76b597f41 /include | |
| parent | ee737aeed714ea28de9c1b475f76abb078385fcc (diff) | |
| parent | 374f341d0bbc7601dac82b60e637aeadf2218938 (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 'include')
0 files changed, 0 insertions, 0 deletions