diff options
| author | plegall <plg@piwigo.org> | 2016-03-10 20:42:18 +0100 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2016-03-10 20:42:18 +0100 |
| commit | 8cfee1dbc5e7a0e88c984c82124f2dcd16e5c486 (patch) | |
| tree | 2186a57cef86d7ca87c4dccc0da1034ad63e80d4 | |
| parent | a32c643cf2b04735d39bb529a9a0a5f92e61c636 (diff) | |
| parent | 9f15161b62a607967127f1dab96b4f18cd66adb7 (diff) | |
Merge branch '2.8'
"git merge -s ours 2.8" won't really apply change on version number introduced in 9f15161b62a607967127f1dab96b4f18cd66adb7
0 files changed, 0 insertions, 0 deletions