Merge branch 'master' into new-grammars

This commit is contained in:
Paul Chaignon
2015-02-09 23:19:37 +01:00
8 changed files with 14 additions and 5 deletions

View File

@@ -1807,7 +1807,7 @@ MediaWiki:
wrap: true
extensions:
- .mediawiki
tm_scope: none
tm_scope: text.html.mediawiki
ace_mode: text
Mercury: