diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 15:06:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-26 15:06:40 +0200 |
| commit | d64dcad840e2dac9438eb054d86968e7f484008b (patch) | |
| tree | 1fa9e1d51f84d6c03360f9e2cb62780dae604ec6 /example_project | |
| parent | 66b32cdb285d504212edbf43d5d2d425d659370a (diff) | |
| parent | 8801ab7b7e655d8b831e535381eeea8adc091989 (diff) | |
| download | Ishtar-d64dcad840e2dac9438eb054d86968e7f484008b.tar.bz2 Ishtar-d64dcad840e2dac9438eb054d86968e7f484008b.zip | |
Merge branch 'v0.9' into wheezy
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 |