Zixaphir 7a58008d0c Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/Miscellaneous/Emoji.coffee

2013-10-19 19:54:09 -07:00

..

appchan-sage.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

applejack.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

arch.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

baka.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

centos.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

crunchbang.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

debian.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

elementary.png

Added elementary icon to emoji

2013-10-15 15:40:25 +01:00

fedora.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

fluttershy.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

freebsd.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

gentoo.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

gnu.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

madotsuki.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

mint.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

neko.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

openbsd.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

osx.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

pinkie.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

plan9.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

ponyo.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

rabite.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

rainbow.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

rarity.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

rhel.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

sabayon.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

sage.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

sakamoto.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

sega.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

slackware.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

spike.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

SS-sage.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

trisquel.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

twilight.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

ubuntu.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

windows.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

yuno.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00