diff options
| author | Frank Allenby <frank@sensepost.com> | 2016-01-29 10:39:07 +0200 |
|---|---|---|
| committer | Frank Allenby <frank@sensepost.com> | 2016-01-29 10:39:07 +0200 |
| commit | ca95adc41fcef5676a15784c11a63d9f44a1e11c (patch) | |
| tree | 692b1234dc761857e4769dfdfb23fe2b230d85d7 | |
| parent | e7be676969f78f313aacbd1d7911ad1a511dcf6d (diff) | |
| download | chat-ca95adc41fcef5676a15784c11a63d9f44a1e11c.tar.gz chat-ca95adc41fcef5676a15784c11a63d9f44a1e11c.tar.bz2 chat-ca95adc41fcef5676a15784c11a63d9f44a1e11c.zip | |
Revised PLT-1592
| -rw-r--r-- | i18n/en.json | 4 | ||||
| -rw-r--r-- | model/version.go | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/i18n/en.json b/i18n/en.json index 0b0f72628..e93e3c280 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3328,10 +3328,6 @@ "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 f503ddb84..88334ceea 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, ".") |