Merge branch 'next-minor' into develop

diaspora · Apr 6, 2017 · 82629c5 · 82629c5
2 parents 24b40a4 + 791e741
commit 82629c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -45,7 +45,7 @@
                            "_" +
                            "\\-" +
                      "]+|<3",
-      // compare tag_strings in lib/diaspora/taggabe.rb
+      // compare tag_strings in lib/diaspora/taggable.rb
       preceding: "^|\\s"
     });