diff options
| author | plegall <plg@piwigo.org> | 2016-03-08 15:34:51 +0100 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2016-03-08 15:34:51 +0100 |
| commit | f0ac27292e2ac24a6cdfdccd63a91db92fc208c2 (patch) | |
| tree | ea2a4a169c0f4cec2cb0983f89f6f46ca0a093e2 /include/emogrifier.class.php | |
| parent | 234c132a1f1389114ff1a63af30bd525232f07d6 (diff) | |
| parent | 507c932db914d7b50f05ca10e626b0da3fff0a68 (diff) | |
Merge branch '2.8'
"git merge -s ours 2.8" suggested by @moy, with only commits d72e825 + 507c932.
On next merge from 2.8 to master, these 2 commits won't be merged.
Diffstat (limited to 'include/emogrifier.class.php')
0 files changed, 0 insertions, 0 deletions