LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

__CHANGELOG_README.txt

…

.all_changelog.yml

gives credit to people who more than deserve it

2017-12-17 10:42:32 -06:00

AutoChangeLog-pr-4491.yml

Automatic changelog generation for PR #4491 [ci skip]

2017-12-22 15:14:27 -06:00

AutoChangeLog-pr-4504.yml

Automatic changelog generation for PR #4504 [ci skip]

2017-12-22 14:33:00 -06:00

AutoChangeLog-pr-4531.yml

Automatic changelog generation for PR #4531 [ci skip]

2017-12-27 20:53:49 -06:00

AutoChangeLog-pr-4538.yml

Automatic changelog generation for PR #4538 [ci skip]

2017-12-27 20:52:47 -06:00

AutoChangeLog-pr-4549.yml

Automatic changelog generation for PR #4549 [ci skip]

2017-12-27 20:52:11 -06:00

AutoChangeLog-pr-4552.yml

Automatic changelog generation for PR #4552 [ci skip]

2017-12-27 20:50:52 -06:00

AutoChangeLog-pr-4554.yml

Automatic changelog generation for PR #4554 [ci skip]

2017-12-28 23:57:42 -06:00

AutoChangeLog-pr-4556.yml

Automatic changelog generation for PR #4556 [ci skip]

2017-12-29 00:47:19 -06:00

AutoChangeLog-pr-4563.yml

Automatic changelog generation for PR #4563 [ci skip]

2017-12-28 23:50:03 -06:00

example.yml

Fixes travis

2017-11-10 09:05:43 -05:00