diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 14:39:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 14:39:13 +0200 |
| commit | eb1585c1ea526d2f0979d6a91b33ed1023f4d8e0 (patch) | |
| tree | 8b9cef16c3dc1077b81465029b102391fa6106fa /example_project | |
| parent | 073e8c59195863fcd70ca0723fd110fc2f908758 (diff) | |
| parent | cdec41e1a2af5fc2a3ab9ca8d3d4ad6fcab848c3 (diff) | |
| download | Ishtar-eb1585c1ea526d2f0979d6a91b33ed1023f4d8e0.tar.bz2 Ishtar-eb1585c1ea526d2f0979d6a91b33ed1023f4d8e0.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'example_project')
| -rwxr-xr-x | example_project/media/upload/templates/ISHTAR_FILE_ACT_AR_Neutre_1.odt | bin | 0 -> 49419 bytes |
| -rwxr-xr-x | example_project/media/upload/templates/document_reference.odt | bin | 0 -> 10678 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/example_project/media/upload/templates/ISHTAR_FILE_ACT_AR_Neutre_1.odt b/example_project/media/upload/templates/ISHTAR_FILE_ACT_AR_Neutre_1.odt Binary files differnew file mode 100755 index 000000000..2ed93861e --- /dev/null +++ b/example_project/media/upload/templates/ISHTAR_FILE_ACT_AR_Neutre_1.odt diff --git a/example_project/media/upload/templates/document_reference.odt b/example_project/media/upload/templates/document_reference.odt Binary files differnew file mode 100755 index 000000000..acda588fb --- /dev/null +++ b/example_project/media/upload/templates/document_reference.odt |