Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

browser

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

2016-08-15 12:58:00 -04:00

changelogs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

images

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

2016-08-15 12:58:00 -04:00

templates

Changes the changelog in the correct fashion, by editing the header/footer html files.

2015-12-23 04:37:50 -05:00

88x31.png

…

archivedchangelog.html

…

bug-minus.png

…

burn-exclamation.png

…

changelog.css

…

changelog.html

Fixes an erroneous changelog entry

2016-10-25 18:44:56 +01:00

changelog.js

…

chevron-expand.png

…

chevron.png

…

create_object.html

…

cross-circle.png

…

hard-hat-exclamation.png

…

image-minus.png

…

image-plus.png

…

map-pencil.png

…

music-minus.png

…

music-plus.png

…

panels.css

…

search.js

…

spell-check.png

…

tick-circle.png

…

wrench-screwdriver.png

…