Merge branch 'master' into api-v1

This commit is contained in:
Stefan Niedermann 2020-06-14 16:14:07 +02:00
commit 2f1611513c

View file

@ -246,8 +246,8 @@
<string name="formatting_help_codefence_inline_escaped" translateable="false">\\`%1$s\\`</string>
<string name="formatting_help_codefence" translateable="false">```</string>
<string name="formatting_help_codefence_escaped" translatable="false">\\`\\`\\`</string>
<string name="formatting_help_javascript_1" translatable="false">if (isAwesome){</string>
<string name="formatting_help_javascript_2" translatable="false">return true</string>
<string name="formatting_help_javascript_1" translatable="false">int getRandom() {</string>
<string name="formatting_help_javascript_2" translatable="false">return 4;</string>
<string name="formatting_help_javascript_3" translatable="false">}</string>
<string name="formatting_help_codefence_javascript_escaped" translatable="false">\\`\\`\\`javascript</string>
<string name="formatting_help_codefence_javascript" translateable="false">```javascript</string>