Merge branch 'leneshka/template-projects'
authorShaverdova Elena <Elena.Shaverdova@jetbrains.com>
Fri, 6 May 2016 09:51:05 +0000 (12:51 +0300)
committerShaverdova Elena <Elena.Shaverdova@jetbrains.com>
Fri, 6 May 2016 09:51:05 +0000 (12:51 +0300)
1  2 
platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java