215662afde
# Conflicts: # static/fontello.json |
||
---|---|---|
.. | ||
css | ||
themes | ||
.gitkeep | ||
aurora_borealis.jpg | ||
config.json | ||
emoji.json | ||
fontello.json | ||
logo.png | ||
styles.json | ||
terms-of-service.html |
215662afde
# Conflicts: # static/fontello.json |
||
---|---|---|
.. | ||
css | ||
themes | ||
.gitkeep | ||
aurora_borealis.jpg | ||
config.json | ||
emoji.json | ||
fontello.json | ||
logo.png | ||
styles.json | ||
terms-of-service.html |