azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-05-06 11:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish merging

Browse Source
This commit is contained in:
Jake
2015-01-26 22:31:35 -06:00
parent 3def0910bc
commit c428499959
6 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
views/index.jade
View File

@@ -371,8 +371,4 @@ block content
img.preload(src="/avatars/020242a17b9441799eff511eea1221da?size=64&helm", alt="preloaded image")
img.preload(src="/avatars/9769ecf6331448f3ace67ae06cec64a3?size=64&helm", alt="preloaded image")
img.preload(src="/avatars/f8cdb6839e9043eea81939f85d9c5d69?size=64&helm", alt="preloaded image")
<<<<<<< HEAD
img.preload(src="/skins/jeb_", alt="preloaded image")
=======
img.preload(src="/skins/jeb_", alt="preloaded image")
>>>>>>> Network rewrite/major cleanup, major caching changes, etc