Merge branch 'master' of https://github.com/Kendos-Kenlen/intellij-community into...
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 13 Jul 2016 17:40:41 +0000 (20:40 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 13 Jul 2016 17:40:41 +0000 (20:40 +0300)
1  2 
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java