summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md8
m---------client-data0
2 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 49976102..edc4dfc5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,11 @@
# Contributing
-*This repository is* ***feature-frozen****. Anything that changes gameplay, adds new content, or extends existing content will NOT be merged.*
+*This repository is* ***feature-frozen****. Anything that changes gameplay,
+adds new content, or extends existing content will NOT be merged.*
-Only patches for the following will be accepted:
+However, we may still merge content also available on TMW Evolved.
+
+
+Otherwise, only patches for the following will be accepted:
## High priority patches
diff --git a/client-data b/client-data
-Subproject d156a77053c859cb10a07f7315ba4c80b29267a
+Subproject 409b28bd761bbb1afb789f21a41f14bf4846a95