diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-09 16:18:26 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-09 16:18:26 +0200 |
| commit | 799bb6e0de68f5dddde53a6ea7178a518d16cbfa (patch) | |
| tree | b8b7b63edae7b9f7553a5df15f2c53c002b26fb5 /data | |
| parent | 6dfbc28042c6e18da9c7578ed626064a4d8c7cb3 (diff) | |
| parent | caf98a6468dcea5ae8c38062e4eb527cb3667db9 (diff) | |
Merge branch 'hotfixes' into beta
Conflicts:
CHANGELOG
README.fr.md
README.md
constants.php
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions