aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-08-21 12:42:45 -0500
committerGitHub <noreply@github.com>2020-08-21 12:42:45 -0500
commit2c6a690d47ca0c48bef84b3d28d58064365a9934 (patch)
treecdc2a42b51e4bbe3c008adab296ac306d6dbdfd7 /base
parentec1c95bdb33dd063880c4cb6c3c9c3cf5d0ed454 (diff)
parentaf1e76022568af1f146e2b49e96af85eb06521b9 (diff)
Merge pull request #246 from AttorneyOnline/2.8
Merges 2.8.5, which is a patch release for 2.8 with no substantially new features. This commit is release-ready.
Diffstat (limited to 'base')
-rw-r--r--base/serverlist.sample.txt (renamed from base/serverlist.txt)0
m---------base/themes0
2 files changed, 0 insertions, 0 deletions
diff --git a/base/serverlist.txt b/base/serverlist.sample.txt
index f700836..f700836 100644
--- a/base/serverlist.txt
+++ b/base/serverlist.sample.txt
diff --git a/base/themes b/base/themes
-Subproject 8de30fc0fa0e1492a29dad0e839764ca44168cb
+Subproject 15b0cc4aa1241a9b740fb1ce8a61c7f699a80de