about summary refs log tree commit diff
path: root/app/views/about
diff options
context:
space:
mode:
authorEffy Elden <github@effy.is>2017-04-17 01:41:33 +1000
committerGitHub <noreply@github.com>2017-04-17 01:41:33 +1000
commitacd33101c50ba0cf09c1c41616f919d37760f3f7 (patch)
tree43564c181a7f58ce7471026bd0daa099344330e8 /app/views/about
parentfd81916e8625e5de39855522300eaeffd85ee13d (diff)
parent99226aba9391535a20d3cc6dba0f45e5792c73d4 (diff)
Merge branch 'master' into fix/cache_blocking
Diffstat (limited to 'app/views/about')
-rw-r--r--app/views/about/terms.no.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/about/terms.no.html.haml b/app/views/about/terms.no.html.haml
index 5506cd863..32ec57ed1 100644
--- a/app/views/about/terms.no.html.haml
+++ b/app/views/about/terms.no.html.haml
@@ -71,6 +71,6 @@
   %p Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 12. april 2017.
 
   %p
-    Dokumentet er en adoptert og endret versjon fra 
+    Dokumentet er en adoptert og endret versjon fra
     = succeed '.' do
       = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse'