Commit graph

2 commits

Author SHA1 Message Date
Delanir
6045169914 Merge remote-tracking branch 'refs/remotes/highfidelity/master'
# Conflicts:
#	scripts/defaultScripts.js
2017-06-22 11:51:05 +01:00
Stephen Birarda
0b05774059 change default avatar to new baked mannequin 2017-06-01 17:12:29 -07:00