summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-01 18:09:37 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-01 18:09:37 -0300
commit08a6f880b64b46db5d4efdcfc48c2cddec589f67 (patch)
tree46e0b34b8075194254a92a9c7109575f4c5df935 /changes
parent1b9f4c824406f26e135a0d96cad04064b8864615 (diff)
parent599f6bf0d4f819ab1613bf9449c122025da07c13 (diff)
Merge remote-tracking branch 'ivan/feature/3318_add-cancel-button-to-login' into develop
Diffstat (limited to 'changes')
-rw-r--r--changes/bug_fail_gracefully_events2
-rw-r--r--changes/feature-3318_add-cancel-button-to-login1
2 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug_fail_gracefully_events b/changes/bug_fail_gracefully_events
new file mode 100644
index 00000000..dbd6f594
--- /dev/null
+++ b/changes/bug_fail_gracefully_events
@@ -0,0 +1,2 @@
+ o Fail gracefully when the events port 8090 is in use by something
+ else. Fixes #3276. \ No newline at end of file
diff --git a/changes/feature-3318_add-cancel-button-to-login b/changes/feature-3318_add-cancel-button-to-login
new file mode 100644
index 00000000..2086e42d
--- /dev/null
+++ b/changes/feature-3318_add-cancel-button-to-login
@@ -0,0 +1 @@
+ o Add cancel button to login. Closes #3318.