Zixaphir d11b435134 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/icon16.png
	builds/crx/icon48.png
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/icon16.png
	src/General/img/icon48.png
	src/Miscellaneous/Emoji.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee

2014-02-16 02:17:36 -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

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

baka.png

Merge Zixaphir X

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

centos.png

Pass the images on Trimage

2014-02-13 18:36:31 +01: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

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

fedora.png

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

fluttershy.png

Merge branch 'v3' into Av2

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

freebsd.png

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

gentoo.png

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

gnu.png

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

madotsuki.png

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

mint.png

Pass the images on Trimage

2014-02-13 18:36:31 +01: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

opensuse.png

Add OpenSUSE emoji

2014-02-10 15:44:48 +01: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

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

rabite.png

Pass the images on Trimage

2014-02-13 18:36:31 +01: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

Pass the images on Trimage

2014-02-13 18:36:31 +01: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

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

trisquel.png

Pass the images on Trimage

2014-02-13 18:36:31 +01:00

twilight.png

Merge branch 'v3' into Av2

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

ubuntu.png

Pass the images on Trimage

2014-02-13 18:36:31 +01: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