Merge branch 'next-minor' into develop

This commit is contained in:
Steffen van Bergerem 2017-04-06 14:10:31 +02:00
commit 82629c5979
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B

View file

@ -45,7 +45,7 @@
"_" +
"\\-" +
"]+|<3",
// compare tag_strings in lib/diaspora/taggabe.rb
// compare tag_strings in lib/diaspora/taggable.rb
preceding: "^|\\s"
});