101 Commits

Author SHA1 Message Date
ccd0
5cd874c3de Merge remote-tracking branch 'archives/master' into bstable 2016-02-13 21:34:15 -08:00
ccd0
368abc9c33 Merge remote-tracking branch 'archives/master' into bstable 2016-02-08 21:06:43 -08:00
ccd0
3ec6c4860a Move fgts archive back to normal place in list. 2016-01-28 08:53:35 -08:00
ccd0
0ff1bda4a8 Temporarily move archives experiencing downtime to the end of the list so different ones are used by default. 2016-01-23 21:46:22 -08:00
ccd0
f64711f315 Merge remote-tracking branch 'archives/pr' 2015-12-24 21:26:08 -08:00
ccd0
75013e49f1 Merge remote-tracking branch 'archives/master' 2015-12-20 17:34:53 -08:00
ccd0
0031e96ce3 Merge remote-tracking branch 'archives/master' into bstable 2015-11-15 20:07:23 -08:00
ccd0
f977b35e6d Merge remote-tracking branch 'archives/master' 2015-11-07 08:31:11 -08:00
ccd0
7e031a765e Merge remote-tracking branch 'archives/master' into bstable 2015-10-31 17:01:28 -07:00
ccd0
af847820ac Merge remote-tracking branch 'archives/master' 2015-10-30 15:48:38 -07:00
ccd0
0a7046cf6d Merge remote-tracking branch 'archives/master' into bstable 2015-10-25 13:15:08 -07:00
ccd0
9bf3d2e75e Merge remote-tracking branch 'archives/master' 2015-10-12 03:30:53 -07:00
ccd0
921674d214 Merge remote-tracking branch 'archives/master' into bstable 2015-10-08 17:53:52 -07:00
ccd0
db72c99792 Merge remote-tracking branch 'archives/master' into bstable 2015-10-07 23:47:13 -07:00
ccd0
1ed4dbcf51 Merge remote-tracking branch 'archives-local/master' into bstable 2015-10-07 12:41:43 -07:00
ccd0
dd70aa0354 Merge remote-tracking branch 'archives/master' into bstable 2015-10-07 12:02:43 -07:00
ccd0
02f0cf6f23 Merge remote-tracking branch 'archives/master' into bstable 2015-10-07 11:08:39 -07:00
ccd0
47c47f04ce Merge remote-tracking branch 'archives/master' into bstable 2015-10-07 10:20:35 -07:00
ccd0
154c71b667 Merge remote-tracking branch 'archives/master' into bstable 2015-10-01 06:28:05 -07:00
ccd0
dd7afffb5a Merge remote-tracking branch 'archives/master' into bstable 2015-09-01 07:50:58 -07:00
ccd0
de69adee37 Revert "Temporarily revert DesuStorage -> archive.horse name change."
This reverts commit 421f48f966dac3a64720a2fde53d104a5dcc44ab.
2015-08-22 12:42:50 -07:00
ccd0
421f48f966 Temporarily revert DesuStorage -> archive.horse name change.
Keeps selected archives settings from breaking until we migrate to UIDs.
2015-08-22 02:14:39 -07:00
ccd0
70aeae7e99 Merge remote-tracking branch 'archives/master' 2015-08-22 02:06:17 -07:00
ccd0
2f48140752 Merge remote-tracking branch 'archives-pr/master' into bstable 2015-07-07 01:06:34 -07:00
ccd0
bd6ebc32e9 Merge remote-tracking branch 'archives/master' into bstable 2015-06-25 23:32:56 -07:00
ccd0
821068d877 Merge remote-tracking branch 'archives/master' 2015-05-15 18:34:48 -07:00
ccd0
7e65db28e3 Merge remote-tracking branch 'theBladeee/patch-1' into bstable 2015-04-19 21:49:32 -07:00
ccd0
999de3fbea Merge remote-tracking branch 'archives/master' into bstable 2015-04-17 22:24:01 -07:00
ccd0
589dbef788 Merge remote-tracking branch 'archives/master' into bstable
Conflicts:
	src/Archive/archives.json
2015-04-13 08:06:54 -07:00
ccd0
d629ecf91c Merge remote-tracking branch 'archives/master' into bstable 2015-04-10 12:34:17 -07:00
ccd0
07f2bc0fca Merge remote-tracking branch 'archives/master' into bstable
Conflicts:
	src/Archive/archives.json
2015-04-08 02:03:53 -07:00
ccd0
94559bf388 Add /b/ to fgts archive. 2015-04-06 17:03:07 -07:00
ccd0
071c6b468c Merge remote-tracking branch 'archives/master' into bstable 2015-04-05 02:07:37 -07:00
ccd0
aceb5b7a33 Merge remote-tracking branch 'archives/master'
Conflicts:
	src/Archive/archives.json
2015-03-21 12:05:23 -07:00
ccd0
2eb6a00665 Merge remote-tracking branch 'archives/master' into bstable
Conflicts:
	src/Archive/archives.json
2015-03-02 12:52:47 -08:00
ccd0
c496b814c5 Merge remote-tracking branch 'archives/master' into bstable 2015-02-23 12:02:08 -08:00
ccd0
03e70ce13e Merge remote-tracking branch 'archives/master' 2015-01-23 14:50:39 -08:00
ccd0
d8d976e6fa Merge remote-tracking branch 'archives/master'
Conflicts:
	src/Archive/archives.json
2015-01-23 12:27:12 -08:00
ccd0
6f4d0835cf Merge remote-tracking branch 'archives/master' into Stable 2014-12-17 18:50:52 -08:00
ccd0
d8f3ae1a1e Merge remote-tracking branch 'archives/master' into Stable 2014-12-12 18:05:32 -08:00
ccd0
0a25ca06d8 Merge remote-tracking branch 'archives/master' into Stable
Conflicts:
	src/Archive/archives.json
2014-12-11 23:15:45 -08:00
ccd0
aedc92c068 Merge remote-tracking branch 'archives/master' into 1.9.12.x 2014-11-26 15:04:05 -08:00
ccd0
2f1a94e802 Merge remote-tracking branch 'archives/master' into 1.9.11.x
Conflicts:
	src/Archive/archives.json
2014-11-19 21:26:25 -08:00
ccd0
89dfbb88d7 Merge remote-tracking branch 'archives/master' into 1.9.11.x 2014-11-18 20:09:26 -08:00
ccd0
eac76296b5 Merge branch 'archives' into 1.9.11.x 2014-11-15 11:19:11 -08:00
Hasumi
dae79ad987 updated archive.moe boards 2014-11-14 23:16:40 -08:00
talichan
83dd6ec697 updates updates updates
Conflicts:
	src/Archive/archives.json
2014-11-12 21:14:56 -08:00
talichan
efda552c56 added /an/
Conflicts:
	src/Archive/archives.json
2014-11-12 20:17:46 -08:00
talichan
73a42e74b0 removed /b/, added /r9k/, /mlp/ & /toy/
/r9k/ on trial.
Conflicts:
	src/Archive/archives.json
2014-11-12 20:12:52 -08:00
Mayhem
4485c5bd4c rm Heinessen 2014-11-12 19:03:00 -08:00