summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel L <jlouzado@gmail.com>2017-02-04 14:04:29 +0200
committerJoel L <jlouzado@gmail.com>2017-02-04 14:04:29 +0200
commit490e15e2c016b6bbcc57b38ad382512806690423 (patch)
treebcd6e05f07933e1fa7e11f9005636c713ef4b9d3
parent09c22eaa55c3d97133f32c78f5d4dc51c0f664e1 (diff)
parent3e2883b9df47fe66f10a99310bdf226e4981dad3 (diff)
downloadwekan-490e15e2c016b6bbcc57b38ad382512806690423.tar.gz
wekan-490e15e2c016b6bbcc57b38ad382512806690423.tar.bz2
wekan-490e15e2c016b6bbcc57b38ad382512806690423.zip
Merge remote-tracking branch 'upstream/devel' into devel
-rw-r--r--README.md11
1 files changed, 4 insertions, 7 deletions
diff --git a/README.md b/README.md
index 483b11f3..7eb829d7 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
[![JOIN OFFICIAL WEKAN CHAT][gitter_badge]][gitter_chat]
-2017-02-03 News: All Wekan fork/Wefork code and pull requests has been
-merged back to official Wekan. Wefork will not accept new pull requests
-and issues to Wefork. All development happens on Wekan.
+2017-02-04 News: All Wekan fork/Wefork code, pull requests and translations
+has been merged back to official Wekan. Wefork will not accept new pull
+requests and issues to Wefork. All development happens on Wekan.
[Wefork announcement and merging back][fork_announcement]
@@ -14,9 +14,7 @@ and issues to Wefork. All development happens on Wekan.
[Wefork FAQ][fork_faq]
-[Translate Wekan using newer Wefork translations at Transifex][translate_wefork]
-
-[Not in use yet: Old Wekan translations at Transifex][translate_wekan]
+[Translate Wekan at Transifex][translate_wekan]
Wekan is an open-source and collaborative kanban board application.
@@ -156,6 +154,5 @@ with [Meteor](https://www.meteor.com).
[docker_nginxproxy]: https://github.com/wefork/wekan/wiki/Docker-NginxProxy
[docker_issue]: https://github.com/wefork/wekan/issues/33
[translate_wekan]: https://www.transifex.com/wekan/wekan/
-[translate_wefork]: https://www.transifex.com/wefork/wefork/
[autoinstall]: https://github.com/wefork/wekan-autoinstall
[autoinstall_issue]: https://github.com/anselal/wekan/issues/18