merge commit

This commit is contained in:
robvde 2013-09-10 15:15:25 +04:00
parent 8bc4ebc9d9
commit de18173631
2 changed files with 3 additions and 2 deletions

View file

@ -21,3 +21,4 @@ WebsitePanel/Bin
msbuild.log
_ReSharper.*
web.config
web.config

View file

@ -5,11 +5,11 @@
</configSections>
<!-- Connection strings -->
<connectionStrings>
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient"/>
<add name="EnterpriseServer" connectionString="server=2012PROV01;database=WebsitePanel;uid=WebsitePanel;pwd=5qc7ftf6q42byc08z857;" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<!-- Encryption util settings -->
<add key="WebsitePanel.CryptoKey" value="1234567890"/>
<add key="WebsitePanel.CryptoKey" value="fbd61z4gwsc2m01x7xn2" />
<!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true"/>
<!-- Web Applications -->