Skip to content

Commit a51a69d

Browse files
committed
Merge branch 'feature/beacon804' into release/8.0.4
# Conflicts: # DNN Platform/Website/Install/Config/08.00.04.config
2 parents f1329a2 + 7dfda1a commit a51a69d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

DNN Platform/Website/Install/Config/08.00.04.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<configuration>
22
<nodes configfile="web.config">
3-
<node path="/configuration/appSettings" action="update" key="key" collision="ignore">
3+
<node path="/configuration/appSettings" action="update" key="key" collision="overwrite">
44
<add key="ImprovementProgram.Endpoint" value="https://dnnapi.com/beacon" />
55
</node>
66
</nodes>

Website/development.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<add key="PreserveLoginUrl" value="true" />
6363
<add key="loginUrl" value="~/Login.aspx" />
6464
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
65-
<add key="ImprovementProgram.Epdpoint" value="https://dev-bcn.dnnapi.com/beacon" />
65+
<add key="ImprovementProgram.Endpoint" value="https://dev.dnnapi.com/beacon" />
6666
</appSettings>
6767

6868
<system.web.webPages.razor>

Website/release.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<add key="PreserveLoginUrl" value="true" />
6363
<add key="loginUrl" value="~/Login.aspx" />
6464
<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
65-
<add key="ImprovementProgram.Epdpoint" value="https://bcn.dnnapi.com/beacon" />
65+
<add key="ImprovementProgram.Endpoint" value="https://dnnapi.com/beacon" />
6666
</appSettings>
6767

6868
<system.web.webPages.razor>

0 commit comments

Comments
 (0)