summaryrefslogtreecommitdiffstats
path: root/client/components/rules
diff options
context:
space:
mode:
authorAkuket <32392661+Akuket@users.noreply.github.com>2018-10-16 11:46:21 +0200
committerGitHub <noreply@github.com>2018-10-16 11:46:21 +0200
commit50edffee47edf94f4f3aa21e5030354a33acf3d6 (patch)
treebc92da43c179b9bc88cd34b0c92c8938007a3517 /client/components/rules
parent41330b15dccfdd45c08b2657833a0bcba9576243 (diff)
parent3dcebe8a9eb6ef96fc8a6a42dc1a1ce7a2a4d98c (diff)
downloadwekan-50edffee47edf94f4f3aa21e5030354a33acf3d6.tar.gz
wekan-50edffee47edf94f4f3aa21e5030354a33acf3d6.tar.bz2
wekan-50edffee47edf94f4f3aa21e5030354a33acf3d6.zip
Merge branch 'edge' into edge
Diffstat (limited to 'client/components/rules')
-rw-r--r--client/components/rules/ruleDetails.jade4
-rw-r--r--client/components/rules/rulesActions.jade2
-rw-r--r--client/components/rules/rulesTriggers.jade2
3 files changed, 3 insertions, 5 deletions
diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade
index 1f351357..7183cf96 100644
--- a/client/components/rules/ruleDetails.jade
+++ b/client/components/rules/ruleDetails.jade
@@ -17,6 +17,4 @@ template(name="ruleDetails")
div.rules-back
button.js-goback
i.fa.fa-chevron-left
- | {{{_ 'r-back'}}}
-
- \ No newline at end of file
+ | {{{_ 'back'}}}
diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade
index 4bcff769..3ac04e1c 100644
--- a/client/components/rules/rulesActions.jade
+++ b/client/components/rules/rulesActions.jade
@@ -26,4 +26,4 @@ template(name="rulesActions")
div.rules-back
button.js-goback
i.fa.fa-chevron-left
- | {{{_ 'r-back'}}} \ No newline at end of file
+ | {{{_ 'back'}}}
diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade
index 01c0cad5..79d9d98e 100644
--- a/client/components/rules/rulesTriggers.jade
+++ b/client/components/rules/rulesTriggers.jade
@@ -22,4 +22,4 @@ template(name="rulesTriggers")
div.rules-back
button.js-goback
i.fa.fa-chevron-left
- | {{{_ 'r-back'}}} \ No newline at end of file
+ | {{{_ 'back'}}}