summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2022-02-20 01:39:32 -0300
committerJesusaves <cpntb1@ymail.com>2022-02-20 01:39:32 -0300
commit3f0c567bf4fe38473f8924d2f55152667f28c0fc (patch)
tree54b3e7059d52101e90906dfdccbc3e5ba943e412
parentc5c931734ca1b61dc0aae16bc8a35f1ec2f9b144 (diff)
downloadserverdata-3f0c567bf4fe38473f8924d2f55152667f28c0fc.tar.gz
serverdata-3f0c567bf4fe38473f8924d2f55152667f28c0fc.tar.bz2
serverdata-3f0c567bf4fe38473f8924d2f55152667f28c0fc.tar.xz
serverdata-3f0c567bf4fe38473f8924d2f55152667f28c0fc.zip
Update CONTRIBUTING and submodules.
(I needed to test my GPG key, and it was outdated, so yeah)
-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