From ca95adc41fcef5676a15784c11a63d9f44a1e11c Mon Sep 17 00:00:00 2001 From: Frank Allenby Date: Fri, 29 Jan 2016 10:39:07 +0200 Subject: [PATCH] Revised PLT-1592 --- i18n/en.json | 4 ---- model/version.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index 0b0f726287..e93e3c2805 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3327,10 +3327,6 @@ "id": "web.reset_password.expired_link.app_error", "translation": "The password reset link has expired" }, - { - "id": "web.reset_password.expired_link.app_error.link_text", - "translation": "Go to Password Reset page" - }, { "id": "web.reset_password.invalid_link.app_error", "translation": "The reset link does not appear to be valid" diff --git a/model/version.go b/model/version.go index f503ddb846..88334ceea9 100644 --- a/model/version.go +++ b/model/version.go @@ -28,7 +28,7 @@ var CurrentVersion string = versions[0] var BuildNumber = "_BUILD_NUMBER_" var BuildDate = "_BUILD_DATE_" var BuildHash = "_BUILD_HASH_" -var BuildEnterpriseReady = "false" +var BuildEnterpriseReady = "_BUILD_ENTERPRISE_READY_" func SplitVersion(version string) (int64, int64, int64) { parts := strings.Split(version, ".")