3 Commits

Author	SHA1	Message	Date
Jordan Brown	bd7a0d65b5	Fix many instances of "the the"	2017-10-13 09:41:54 -05:00
kevinz000	9b71e967d2	Merge branch 'master' into upstream-merge-29964	2017-08-29 21:07:01 -07:00
kevinz000	c638386507	Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) ... * fuck pubby * fuck you too ceres * ree * this is going to be a disaster isn't it * disaster * dme * -_- * tg * woops * proper sync * Welcome to conflict hell. * lets hope this fixes more things than it breaks * gdi * goddamnit	2017-08-24 21:07:58 -07:00