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)
commite6c688ea651248dab39c38939e06798087e75b90
tree1ad7d0330524ffadfd60993bc0d7298dc460c42f
parenta4cd531e39d57061f54f1bea640520613f5b47e4
parent78b41927b5b0c86a707997bc572e912c3a37b447
Merge branch 'master' of https://github.com/Kendos-Kenlen/intellij-community into Kendos-Kenlen-master
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java