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)
commitddac95b3719b77cb2598f30dff7be97a57619ab1
tree9fb23a1d52dc38fffd28453be357cf8f89688cae
parent3bef2f5b76443f1d62dba8c624c534ec867fa0bf
parent78f7be1bcd78b63b7e07dfeb2c0f82e8df006b9b
Merge branch 'leneshka/template-projects'
platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
platform/lang-impl/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java