diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 15:05:09 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 15:05:09 +0200 |
commit | 8801ab7b7e655d8b831e535381eeea8adc091989 (patch) | |
tree | fd1cfe512c94affdfae65e7ec3078648eabffbd7 /example_project | |
parent | c42486f81b042d18b9cf825da9f35a83e00bc051 (diff) | |
parent | 005f3962ab8d0eef66de6dd335f619702107116a (diff) | |
download | Ishtar-8801ab7b7e655d8b831e535381eeea8adc091989.tar.bz2 Ishtar-8801ab7b7e655d8b831e535381eeea8adc091989.zip |
Merge branch 'master' into v0.9
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 |