Merge remote-tracking branch 'origin/release/v1.9.6' into release/v1.9.6

# Conflicts: # static/src/assets/i18n/statistics/en.json
Add new i18n for english
2019-10-11 20:16:27 +02:00 · 2019-10-11 20:13:12 +02:00 · 2019-10-11 20:13:07 +02:00
1 changed files with 0 additions and 1 deletions
--- a/static/src/assets/i18n/statistics/en.json
+++ b/static/src/assets/i18n/statistics/en.json
@ -98,7 +98,6 @@
  "stats.war.submit.mapping.blufor": "Fraction Mapping NATO",
  "stats.war.submit.mapping.opfor": "Fraction Mapping CSAT",

-
  "stats.campaign.submit.headline.new": "Add new campaign",
  "stats.campaign.submit.headline.edit": "Edit campaign",
  "stats.campaign.submit.title": "Title",
Author	SHA1	Message	Date
HardiReady	15ca881b0c	Merge remote-tracking branch 'origin/release/v1.9.6' into release/v1.9.6 # Conflicts: # static/src/assets/i18n/statistics/en.json	2019-10-11 20:16:27 +02:00
HardiReady	02d6d1b895	Add new i18n for english	2019-10-11 20:13:12 +02:00
HardiReady	e77d70fd83	Add new i18n for english	2019-10-11 20:13:07 +02:00