diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-19 11:32:04 +0200 |
| commit | 54b87741a26a2bd805ed32200b082ca07ee0e27d (patch) | |
| tree | 70302bf14268e6374fb1faf0438db01e57db01ae /archaeological_operations | |
| parent | 0ca23dab03f240b8e960b417aed4451c10b51402 (diff) | |
| parent | ac1c36d915d54ad4bef873a313fe04e2935c1fad (diff) | |
| download | Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.tar.bz2 Ishtar-54b87741a26a2bd805ed32200b082ca07ee0e27d.zip | |
Merge branch 'master' into v0.9
Conflicts:
CHANGES.txt
version.py
Diffstat (limited to 'archaeological_operations')
3 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact_pdf.html b/archaeological_operations/templates/ishtar/sheet_administrativeact_pdf.html index e3c78d733..b6d257cb0 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact_pdf.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact_pdf.html @@ -1,6 +1,6 @@ {% extends "ishtar/sheet_administrativeact.html" %} {% block header %} -<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css" /> +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> {% endblock %} {% block main_head %} {{ block.super }} diff --git a/archaeological_operations/templates/ishtar/sheet_operation_pdf.html b/archaeological_operations/templates/ishtar/sheet_operation_pdf.html index f23b0d489..dc3c8b46f 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation_pdf.html +++ b/archaeological_operations/templates/ishtar/sheet_operation_pdf.html @@ -1,6 +1,6 @@ {% extends "ishtar/sheet_operation.html" %} {% block header %} -<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css" /> +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> {% endblock %} {% block main_head %} {{ block.super }} diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html b/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html index 32362d4c2..1b2cd9ff3 100644 --- a/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html +++ b/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html @@ -1,6 +1,6 @@ {% extends "ishtar/sheet_operationsource.html" %} {% block header %} -<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css" /> +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> {% endblock %} {% block main_head %} {{ block.super }} |