Zixaphir
|
f453276a9c
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
Gruntfile.js
src/config.coffee
src/features.coffee
src/main.coffee
src/qr.coffee
|
2013-04-08 07:44:26 -07:00 |
|
Nicolas Stepien
|
d8c75d9b37
|
Merge branch 'master' into v3
|
2013-04-08 01:28:10 +02:00 |
|
Nicolas Stepien
|
13012e1175
|
Merge branch 'master' into v3
|
2013-04-06 05:07:18 +02:00 |
|
Nicolas Stepien
|
4318413a92
|
Merge branch 'master' into v3
|
2013-04-01 20:15:20 +02:00 |
|
Nicolas Stepien
|
c3a09159a3
|
Merge branch 'master' into v3
|
2013-04-01 16:34:40 +02:00 |
|
Zixaphir
|
1662401958
|
Merge remote-tracking branch 'mayhem/v3' into v3
Conflicts:
.gitattributes
4chan-X.meta.js
4chan-X.user.js
Gruntfile.js
lib/$.coffee
src/config.coffee
src/features.coffee
src/globals.coffee
|
2013-03-28 20:42:02 -07:00 |
|
Nicolas Stepien
|
2666e07d3f
|
Rename the old changelog file. #968
|
2013-03-24 17:52:39 +01:00 |
|