Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

access levels.txt

…

admin_ranks.txt

Fuck this shit

2020-04-04 14:37:55 -04:00

admins.txt

…

alienwhitelist.txt

…

config.txt

Update config.txt

2020-08-31 23:56:55 -04:00

custom_items.txt

…

custom_sprites.txt

…

dbconfig.txt

…

forumdbconfig.txt

…

game_options.txt

Update game_options.txt

2019-03-28 21:02:43 -04:00

jobs.txt

…

jukebox.txt

Switch VOREStation jukebox to read track list from a configuration file.

2017-03-20 18:37:30 -04:00

mentors.txt

…

moderators.txt

…

motd.txt

Amend MOTD to reference Polaris code

2018-04-01 18:29:55 +10:00

rules.html

…

sqlite_feedback_pepper.txt

Adds an In-game Feedback System

2020-02-24 16:35:08 -05:00

svndir.txt

…