698d828a41
Update history to reflect merge of #2129 [ci skip]
2014-03-16 13:30:24 -04:00
8af2a9ade3
Update history to reflect merge of #2143 [ci skip]
2014-03-16 13:25:16 -04:00
7288176f65
Update history to reflect merge of #2126 [ci skip]
2014-03-13 10:39:38 -04:00
72438dbdaa
Update history to reflect merge of #2128 [ci skip]
2014-03-12 15:34:40 -04:00
98109d2e39
Update history to reflect merge of #2122 [ci skip]
2014-03-11 11:10:32 -04:00
84a911f145
Update history to reflect merge of #2109 [ci skip]
2014-03-11 11:09:12 -04:00
fd1a95ac87
Update history to reflect merge of #2121 [ci skip]
2014-03-11 08:32:59 -04:00
48d5f79d9a
Update history to reflect merge of #2118 [ci skip]
2014-03-09 14:06:48 -05:00
05664acd36
Update history to reflect merge of #2112 [ci skip]
2014-03-04 17:02:05 -05:00
171452095f
Update history to reflect merge of #2108 [ci skip]
2014-03-03 20:12:29 -05:00
f3dfe1dd09
Update history to reflect merge of #2098 [ci skip]
2014-02-28 21:37:02 -05:00
bbcd5bc8c7
Update history to reflect merge of #2105 [ci skip]
2014-02-27 17:56:49 -05:00
12375846c8
Update history to reflect merge of #2102 [ci skip]
2014-02-27 08:34:22 -05:00
d21ab37abd
Update history to reflect merge of #2081 [ci skip]
2014-02-24 18:58:41 -05:00
644f012c42
Update history to reflect merge of #2097 [ci skip]
2014-02-24 18:56:46 -05:00
f5890e343f
Update history to reflect merge of #2096 [ci skip]
2014-02-24 16:55:41 -05:00
83e3c0f7ba
Update history to reflect merge of #2095 [ci skip]
2014-02-24 15:23:15 -06:00
61397cd302
Update history to reflect merge of #2094 [ci skip]
2014-02-24 16:21:00 -05:00
ed5670eb48
Update history to reflect merge of #2050 [ci skip]
2014-02-24 16:09:10 -05:00
87a3208df2
Update history to reflect merge of #2067 [ci skip]
2014-02-23 20:15:47 -05:00
de7a944601
Update history to reflect merge of #2065 [ci skip]
2014-02-23 20:07:05 -05:00
89e914b160
Update history to reflect merge of #2084 [ci skip]
2014-02-21 18:22:47 -05:00
d6ecb5025a
Update history to reflect merge of #2085 [ci skip]
2014-02-21 18:21:32 -05:00
53ad55a1b2
Update history to reflect merge of #2090 [ci skip]
2014-02-21 18:19:53 -05:00
276b400a86
Update history to reflect merge of #2061 [ci skip]
2014-02-20 14:30:34 -06:00
1c4974f6ea
Update history to reflect merge of #2074
2014-02-19 17:09:10 -06:00
de3570714f
Update history to reflect merge of #2077 [ci skip]
2014-02-19 14:53:00 -05:00
0d1fcc0691
Update history to reflect merge of #2075 [ci skip]
2014-02-19 14:15:41 -05:00
45a5671c55
Update history to reflect merge of #2073 [ci skip]
2014-02-19 11:11:25 -05:00
b1812e7711
Move Kramdown version bump to Minor Enhancements section.
...
Closes #2069 .
2014-02-19 00:13:24 -05:00
9414280aa7
Update history to reflect merge of #2058 [ci skip]
2014-02-18 01:53:47 -05:00
7706231f16
Update history to reflect merge of #2041 [ci skip]
2014-02-17 16:23:50 -05:00
84471ba202
Update history to reflect merge of #1946 [ci skip]
2014-02-16 22:14:43 -05:00
594e2a94c7
Update history to reflect merge of #2042 [ci skip]
2014-02-16 21:36:40 -05:00
c4f5415ece
Update history to reflect merge of #2056 [ci skip]
2014-02-16 21:12:03 -05:00
c6b4c41aab
Update history to reflect merge of #2048 [ci skip]
2014-02-15 17:28:06 -05:00
8d39bf3850
Update history to reflect merge of #2049 [ci skip]
2014-02-15 17:26:34 -05:00
da446c0f19
Update history to reflect merge of #2047 [ci skip]
2014-02-14 15:41:07 -05:00
c77ef87b05
Update history to reflect merge of #2045
2014-02-14 12:46:10 -06:00
1482c8aecc
Update history to reflect merge of #2044 [ci skip]
2014-02-14 13:36:32 -05:00
729b6db7c2
Update history to reflect merge of #2009 [ci skip]
2014-02-13 17:56:57 -05:00
ec93743659
Update history to reflect merge of #1976
2014-02-13 12:39:00 -06:00
54e5e660db
Update history to reflect merge of #2031 [ci skip]
2014-02-13 12:54:21 -05:00
8929d1bd63
Update history to reflect merge of #2038 [ci skip]
2014-02-13 12:52:54 -05:00
b6c8b39899
Update history to reflect merge of #1988 [ci skip]
2014-02-08 17:08:30 -05:00
2e2563fab9
Update history to reflect merge of #2015 [ci skip]
2014-02-08 00:34:16 -05:00
71b2257829
Update history to reflect merge of #2016 [ci skip]
2014-02-08 00:33:32 -05:00
a63e62f643
Update history to reflect merge of #2020 [ci skip]
2014-02-08 00:32:20 -05:00
182a49fcff
Update history to reflect merge of #2013 [ci skip]
2014-02-04 17:04:01 -05:00
1e6847c43f
Update history to reflect merge of #1982
2014-01-31 08:48:18 -06:00
37dbc646a1
Update history to reflect merge of #2005
2014-01-31 08:45:14 -06:00
1470a8a997
Update history to reflect merge of #2004
2014-01-31 08:44:33 -06:00
03ba5d8d18
Update history to reflect merge of #2001 [ci skip]
2014-01-31 00:24:59 -05:00
669cc496cd
Update history to reflect merge of #1991
2014-01-30 20:39:46 -06:00
1d014edca2
Update history to reflect merge of #1999 [ci skip]
2014-01-28 23:40:08 -05:00
dbd3d15f29
Update history to reflect merge of #1998 [ci skip]
2014-01-28 23:39:12 -05:00
c9a732c4f9
Update history to reflect merge of #1993 [ci skip]
2014-01-26 13:39:31 -05:00
ea397d0946
Update history to reflect merge of #1984
2014-01-24 21:45:37 -06:00
ecc05e57ae
Update history to reflect merge of #1985
2014-01-24 21:42:59 -06:00
2e1ab7e6fe
Update history to reflect merge of #1983
2014-01-24 21:10:50 -06:00
b2c45aafdc
Update history to reflect merge of #1932
2014-01-24 17:17:55 -06:00
8114ae6552
Update history to reflect merge of #1931
2014-01-22 07:38:33 -06:00
30d8743853
Update history to reflect merge of #1951 [ci skip]
2014-01-21 23:07:28 -05:00
f2fadd6562
Update history to reflect merge of #1962 [ci skip]
2014-01-21 23:05:46 -05:00
9210d4ebd8
Update history to reflect merge of #1935
2014-01-21 07:50:14 -06:00
d37ea10cf8
Update history to reflect merge of #1970 [ci skip]
2014-01-19 23:18:59 -05:00
a859c4509a
Update history to reflect merge of #1971
2014-01-19 22:06:43 -06:00
e7139cbd85
Update history to reflect merge of #1953 [ci skip]
2014-01-15 23:40:17 -08:00
8337cbb31f
Update history to reflect merge of #1958
2014-01-15 23:24:27 -06:00
0be62fa2e0
Update history to reflect merge of #1947
2014-01-15 22:13:37 -06:00
5dc4c67344
Merge pull request #1947 from jekyll/1-4-3-release-info
2014-01-15 20:13:31 -08:00
ea94e5dd1c
Update history to reflect merge of #1949 [ci skip]
2014-01-14 08:56:28 -08:00
b3064a9b7d
Forgot #1943 in the line, whoopsie
2014-01-14 08:44:20 -08:00
dc599121a0
Update history to reflect merge of #1943 [ci skip]
2014-01-14 08:43:53 -08:00
e87cd8d53c
Update History.markdown with 1.4.3 release.
2014-01-13 22:27:41 -08:00
750a56d1fe
Update history to reflect merge of #1940
2014-01-13 13:13:31 -06:00
2c2beb9c1f
Update history to reflect merge of #1938
2014-01-13 09:16:29 -06:00
0d6db1613f
Update history to reflect merge of #1936 [ci skip]
2014-01-12 21:30:18 -08:00
f8c904908a
Update history to reflect merge of #1933 .
...
[ci skip]
2014-01-12 13:53:56 -08:00
8bc51fdb5c
Update history to reflect merge of #1928 [ci skip]
2014-01-11 15:32:12 -08:00
cc2ac99487
Update history to reflect merge of #1916
2014-01-11 12:37:33 -06:00
60524a1b6c
Update history to reflect merge of #1923
2014-01-11 12:35:51 -06:00
649e5a156a
Update history to reflect merge of #1927
2014-01-11 12:20:19 -06:00
459a4c1e55
Update history to reflect merge of #1883 [ci skip]
2014-01-06 20:55:43 -08:00
437693e744
Update history to reflect merge of #1912 [ci skip]
2014-01-04 14:09:49 -08:00
b05a44cb2a
Update history to reflect merge of #1910
2014-01-04 10:12:24 -06:00
6184c4e44b
Update history to reflect merge of #1899
2014-01-04 10:04:24 -06:00
bbcd94e7fa
Update history to reflect merge of #1875
2014-01-04 10:01:58 -06:00
32b952803e
Update history to reflect merge of #1898
2014-01-03 21:14:12 -08:00
eb67894e0f
Update history to reflect merge of #1900
2014-01-03 11:12:48 -08:00
b273ac38a6
Update history to reflect merge of #1902
2014-01-02 13:26:08 -08:00
36495487a3
Update history to reflect merge of #1889
2013-12-31 18:52:24 -08:00
29720674dc
Update history to reflect merge of #1896
2013-12-31 18:50:07 -08:00
b0ca19c67b
Update history to reflect merge of #1897
2013-12-31 18:48:46 -08:00
012387396a
Merge pull request #1859 from robin850/rouge
2013-12-30 22:45:07 -06:00
47e4e81053
Update history to reflect merge of #1849
2013-12-30 22:32:21 -06:00
7c276c6f64
Update history to reflect merge of #1894
2013-12-30 16:35:48 -08:00
ac9bca80c8
Update history to reflect merge of #1893
2013-12-30 11:07:50 -08:00
194109d677
Update history to reflect merge of #1886
2013-12-28 13:46:40 -05:00
da8571beec
Update history to reflect merge of #1879
2013-12-26 15:23:28 -05:00
7093d3aa82
Update history to reflect merge of #1877
2013-12-26 02:02:42 -05:00
a2853456b6
Update history to reflect merge of #1825
2013-12-26 01:33:17 -05:00
46e47e6713
Update history to reflect merge of #1831
2013-12-26 01:14:48 -05:00
92c3d6d3fd
Update history to reflect merge of #1841
2013-12-26 01:12:40 -05:00
fbf2b5734e
Update history to reflect merge of #1866
2013-12-26 01:07:01 -05:00
0ebec0b03f
Update history to reflect merge of #1872
2013-12-26 01:06:02 -05:00
1550c60278
Update history to reflect merge of #1847
2013-12-24 14:05:54 -05:00
169e526f2f
Update history to reflect merge of #1867
2013-12-24 14:05:00 -05:00
42aef79ab3
Update history to reflect merge of #1864
2013-12-22 22:15:09 -05:00
0831d2b0f8
Add support for the Rouge syntax highlighter
...
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
92064134d6
Rename the pygments option to highlighter
...
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.
It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
903cce2745
Fix the highlight tag feature
...
Previously, the assertion made wasn't enough to check whether the code
block was correctly parsed through Pygments (and it was not the case).
This commit simply ensure there is a div with the "highlight" class and
fix the test to correctly invoke the Liquid tag rendering.
2013-12-22 12:29:19 +01:00
354b4b9c54
Update history to reflect merge of #1854
2013-12-19 19:58:36 -05:00
8cb1dc47d9
Update history to reflect merge of #1848
2013-12-19 15:20:51 -05:00
12a55b86ac
Update history to reflect merge of #1836
2013-12-16 20:32:28 -05:00
6b5ce3a9f0
Add v1.4.2 to History.markdown
2013-12-16 20:26:43 -05:00
b7bdcb19ca
Update history to reflect merge of #1818
2013-12-11 18:31:13 -05:00
6d0a168d6d
Update history to reflect merge of #1817
2013-12-11 16:47:37 -06:00
379093f940
Update history to reflect merge of #1815
2013-12-11 16:00:47 -06:00
827c4b9bda
Update history to reflect merge of #1812
2013-12-11 16:53:39 -05:00
e5c8c94cd1
Update history to reflect merge of #1780
2013-12-11 08:08:14 -06:00
fc760c1604
Update history to reflect merge of #1706
2013-12-10 23:16:44 -06:00
b49c6508f5
Update history to reflect merge of #1805
2013-12-10 22:58:48 -06:00
48834891ac
Update history to reflect merge of #1799
2013-12-10 22:30:55 -06:00
8d44fa913b
Update history to reflect merge of #1803
2013-12-10 17:49:44 -05:00
01ee2ada7c
Update history to reflect merge of #1804
2013-12-10 16:14:25 -05:00
6e74ec2f71
Update history to reflect merge of #1788
2013-12-10 11:49:44 -05:00
c669d1519d
Reformat to match the rest of the file
2013-12-09 21:39:24 -06:00
a81479adbf
Update history to reflect merge of #1795
2013-12-09 21:36:23 -06:00
8ebd5852cd
Updates for the 1.4.1 release
...
The 1.4.1 release is on the v1-stable branch
2013-12-09 20:49:15 -06:00
10e350d47b
Update history to reflect merge of #1796
2013-12-09 20:24:31 -06:00
df1a999031
Update history to reflect merge of #1800
2013-12-09 18:00:09 -05:00
5495e0b21a
Update history to reflect merge of #1797
2013-12-09 17:57:40 -05:00
4fb6022113
Update history to reflect merge of #1791
2013-12-09 12:33:36 -05:00
d2e948600f
Update history to reflect merge of #1787
2013-12-08 01:05:10 -05:00
fa3476dd2a
Update history to reflect merge of #1657
2013-12-08 00:43:44 -05:00
315fb0cf20
Use YYYY-MM-DD in History file :)
2013-12-07 19:31:48 -05:00
7da676bcc2
Update History.markdown for the 1.4.0 release
2013-12-07 17:58:51 -06:00
8b0ea62535
Update history to reflect merge of #1779
2013-12-06 23:03:59 -06:00
e14fe116db
Update history to reflect merge of #1778
2013-12-05 21:43:11 -05:00
654fe6117b
Update history to reflect merge of #1682
2013-12-04 20:40:58 -06:00
dc7be86970
Update history to reflect merge of #1765
2013-12-04 20:28:58 -06:00
4076b12400
Update history to reflect merge of #1772
2013-12-04 20:25:34 -06:00
7af757a3fc
Update history to reflect merge of #1762
2013-12-02 15:36:55 -05:00
6768977c27
Update history to reflect merge of #1755
2013-12-02 15:35:43 -05:00
9cfe1f0a9c
Update history to reflect merge of #1769
2013-12-01 19:27:03 -05:00
91a4c5611e
Prep for the 1.3.1 release
2013-11-26 20:27:27 -06:00
4cc0bdf8ff
Update history to reflect merge of #1759
2013-11-26 19:46:46 -06:00
47eac96fdc
Update history to reflect merge of #1754
2013-11-25 20:56:51 -06:00
7cda916faa
Update history to reflect merge of #1448
2013-11-22 23:00:24 -06:00
33be5b0361
Update history to reflect merge of #1746
2013-11-22 22:30:29 -06:00
16f4d025ab
Update history to reflect merge of #1736
2013-11-22 22:23:27 -06:00
8595ea812c
Update history to reflect merge of #1718
2013-11-22 20:32:27 -06:00
ed7fb46b96
Update history to reflect merge of #1741
2013-11-21 15:57:03 -05:00
063ee6fb67
Update history to reflect merge of #1734
2013-11-19 13:49:52 -05:00
f4918a623b
Update history to reflect merge of #1732
2013-11-18 18:59:10 -05:00
315cfcd727
Update history to reflect merge of #1730
2013-11-17 23:01:28 -06:00
1d81f2553d
Update history to reflect merge of #1726
2013-11-15 08:26:45 -06:00
6842148389
Update history to reflect merge of #1669
2013-11-10 21:45:47 -06:00
861f367de7
Update history to reflect merge of #1711
2013-11-08 23:16:36 -05:00
0a359b586d
Update history to reflect merge of #1707
2013-11-08 14:34:33 -05:00
0819877701
Update history to reflect merge of #1708
2013-11-08 14:28:48 -05:00
0a0acaad37
Update history to reflect merge of #1697
2013-11-05 07:45:44 -06:00
a26663fb36
Update history to reflect merge of #1670
2013-11-04 23:21:40 -05:00
93bd11ea05
Update history to reflect merge of #1695
2013-11-04 23:16:49 -05:00
2b851be9bd
Update history to reflect merge of #1693
2013-11-04 23:15:29 -05:00
5d672782fb
Update jekyllrb.com site history.
2013-11-04 21:07:51 -05:00
b9817ab47b
Fix release date of v1.3.0 in History file
2013-11-04 14:40:53 -05:00
cc0c82f9d2
Prep for the 1.3.0 release
2013-11-03 21:46:02 -06:00
3eed1cfed1
Update history to reflect merge of #1691
2013-11-03 09:55:54 -06:00
e70c71edd4
Update history to reflect merge of #1687
2013-11-01 22:56:05 -05:00
aebda2b7d8
Update history to reflect merge of #1677
2013-10-30 07:44:49 -05:00
700fb7cb6d
Fix a typo.
2013-10-28 22:38:29 -05:00
1d72b1369f
Update history to reflect merge of #1662
2013-10-28 22:37:31 -05:00
08adcd4a37
Update history to reflect merge of #1665
2013-10-28 14:36:25 -05:00
1eb55119a3
Update history to reflect merge of #1663
2013-10-26 22:11:13 -05:00
6949006051
Update history to reflect merge of #1405
2013-10-26 21:59:08 -05:00
727a705d67
Update history to reflect merge of #1660
2013-10-25 10:00:05 -05:00
9b40ae6b36
Update history to reflect merge of #1582
2013-10-23 22:59:43 -05:00
112aa8112d
Update history to reflect merge of #1651
2013-10-23 22:51:13 -05:00
2397a16658
Update history to reflect merge of #1493
2013-10-23 22:49:50 -05:00
2c11a6ec27
Update history to reflect merge of #1589
2013-10-23 22:47:01 -05:00
32c7530ea6
Update history to reflect merge of #1656
2013-10-23 22:37:44 -05:00
6c001f10ab
Update history to reflect merge of #1557
2013-10-23 09:40:39 -05:00
58ae8bc0cd
Update history to reflect merge of #1543
2013-10-17 08:36:29 -05:00
3cd230d66e
Update history to reflect merge of #1637
2013-10-17 08:23:26 -05:00
6e77788a06
Update history to reflect merge of #1638
2013-10-17 08:21:47 -05:00
b0ae2c69c9
Update history to reflect merge of #1636
2013-10-17 08:13:28 -05:00
61e6a834cb
Update history to reflect merge of #1635
2013-10-16 10:10:28 -05:00
6f7935857a
Update history to reflect merge of #1626
2013-10-11 15:35:25 +00:00
976cddf477
Update history to reflect merge of #1614
2013-10-10 20:49:55 -05:00
441b6d68c2
Update history to reflect merge of #1615
2013-10-10 20:48:27 -05:00
110aeee9a2
Update history to reflect merge of #1622
2013-10-10 20:39:23 -05:00
848a11b3a8
Update history to reflect merge of #1616
2013-10-05 20:38:09 -04:00
41adc30667
Update history to reflect merge of #1602
2013-10-04 14:40:39 -04:00
55f4c3a0fd
Update history to reflect merge of #1613
2013-10-04 13:37:11 -04:00
06a757f156
Update history to reflect merge of #1610
2013-10-04 12:31:22 -04:00
31b6a930c4
Update history to reflect merge of #1603
2013-10-04 12:29:39 -04:00
c32e317236
Update history to reflect merge of #1606
2013-10-04 12:28:56 -04:00
9dc6fee9c5
Move version updates for development dependencies to 'Development Fixes' heading.
2013-10-04 12:27:53 -04:00
87693eeffe
Update history to reflect merge of #1607
2013-10-04 12:27:19 -04:00
558dad7e70
Update history to reflect merge of #1604
2013-10-04 12:23:30 -04:00
2763d785b8
Update history to reflect merge of #1608
2013-10-04 12:21:15 -04:00
d32e3a06b4
Update history to reflect merge of #1495
2013-10-04 07:42:47 -05:00
a5cb8c9f64
Update history to reflect merge of #1601
2013-10-04 07:40:45 -05:00
7d56426d50
Update history to reflect merge of #1592
...
Combine it with the entry for #1590 since they're related. Move it
down to the site enhancements section since both pulls are changes to
the site.
2013-10-02 23:12:36 -05:00
bc71dc84f1
Update history to reflect merge of #1503
2013-10-02 22:55:13 -05:00
6d74b4df00
Update history to reflect merge of #1596
2013-10-02 21:48:03 -05:00
09b5477856
Update history to reflect merge of #1598
2013-10-02 21:07:40 +00:00
cb8572fedb
Update history to reflect merge of #1514
2013-09-30 22:55:26 -05:00
246825ac12
Update history to reflect merge of #1003
2013-09-30 22:50:23 -05:00
e8cab9da26
Update history to reflect merge of #1586
2013-09-30 22:47:18 -05:00
92907c9545
Update history to reflect merge of #1590
2013-09-30 16:41:10 -05:00
35336bfff4
Update history to reflect the merge of #1577 .
2013-09-27 15:12:50 -04:00
5badf7d53b
Update history to reflect merge of #1449
2013-09-23 22:31:38 -04:00
903be7b750
Update history to reflect merge of #1571
2013-09-23 10:17:43 -04:00
93b5004c48
Update history to reflect merge of #1574
2013-09-23 09:12:44 -05:00
7ccb62e524
Update history to reflect merge of #1490
2013-09-18 21:36:27 -05:00
bbd275840b
Update history to reflect fixing of #1561
2013-09-18 13:52:25 -04:00
f7beb6bff0
Update history to reflect merge of #1255
2013-09-16 21:38:31 -05:00
045464c8d4
Update history to reflect merge of #1553
2013-09-16 20:38:47 -05:00
bff0f9e537
Update history to reflect merge of #1556
2013-09-16 20:35:14 -05:00
c376f345fa
Update history to reflect merge of #1539
2013-09-16 20:29:17 -05:00
79c2d5c8f7
Update history to reflect merge of #1555
2013-09-15 20:19:38 -04:00
6d28d5f95f
Update history to reflect merge of #1554
2013-09-15 17:26:15 -04:00
f922ae10e5
Update the History file
2013-09-14 20:49:23 -04:00
a1e16b3d58
Update history to reflect merge of #1518
2013-09-14 20:45:24 -04:00
1473448dfd
Update history to reflect merge of #1537
2013-09-14 08:00:35 -05:00
214c851be5
Update history to reflect merge of #1536
2013-09-12 14:02:22 -04:00
c38220f45c
Update history to reflect merge of #1531
2013-09-12 12:45:19 -04:00
c219323384
Update history to reflect merge of #1516
2013-09-12 10:38:02 -04:00
e65305990a
Update history to reflect merge of #1525
2013-09-11 23:45:01 -04:00
70d9225d9c
Update history to reflect merge of #1515
2013-09-10 11:57:14 -04:00
828c4ba270
Update history to reflect merge of #1522
2013-09-09 20:18:43 -04:00
0dc86aa3f3
Update history to reflect merge of #1512
2013-09-09 08:06:59 -05:00
ce6b591f45
Fix latest entries without code tag
2013-09-07 08:45:58 +02:00
73789f20e1
Update history and History.markdown so it is consistent with previous release headers.
2013-09-07 01:59:48 -04:00
d9f73cad9d
Fix merge conflict.
2013-09-07 00:12:15 -04:00
2d8edb9516
Update History to reflect what happenend in d48f339a1f.
2013-09-07 00:11:20 -04:00
e87006206e
Update history to reflect merge of #1507
2013-09-06 22:58:42 -05:00
e1a8ade88e
Update history to reflect merge of #1404
2013-09-06 22:42:49 -05:00
3a6ffade0b
Update history to reflect merge of #1363
2013-09-06 22:38:38 -05:00
c6ae8043a0
Update history to reflect merge of #1511
2013-09-06 22:31:49 -05:00
d2e23470c0
Update History.markdown.
2013-09-06 22:23:08 -04:00
71a8843ecd
Update history to reflect merge of #1506
2013-09-05 17:56:40 -04:00
c7c18507e3
Update history to reflect merge of #1481
2013-09-05 15:27:03 -05:00
f0604d4956
Update history to reflect merge of #1494
2013-09-05 15:23:34 -05:00
3803d555ef
Update history to reflect merge of #1498
2013-09-05 15:15:41 -05:00
ce6925b487
Update history to reflect merge of #1501
2013-09-05 15:12:16 -05:00
da1e6d27c2
Update history to reflect merge of #1491
2013-09-04 10:37:47 -04:00
22847029eb
Update history to reflect merge of #1497
2013-09-03 14:00:43 -04:00
2cc5dc3704
Update history to reflect merge of #1488
2013-09-01 13:37:06 -04:00
4a7da0070f
Update history to reflect merge of #1486
2013-09-01 12:39:50 -04:00
8a431686cd
Update history to reflect merge of #1480
2013-08-30 18:41:56 -04:00
39d8f40b72
Update history to reflect merge of #1463
2013-08-30 18:39:27 -04:00
9e0ed07399
Update history to reflect merge of #1477
2013-08-30 18:33:07 -04:00
289117d4fe
Update history to reflect merge of #1341
2013-08-29 22:21:48 -05:00
49c529f420
Update history to reflect merge of #1474
2013-08-29 21:58:47 -05:00
590d22d628
Update history to reflect merge of #1462
2013-08-28 18:13:18 -04:00
b3d831d4ab
Update history to reflect merge of #1382
2013-08-28 18:03:57 -04:00
5033437fa5
Update history to reflect merge of #1429
2013-08-26 17:02:46 -04:00
0c1d27fc66
Update history to reflect merge of #1458
2013-08-26 17:00:30 -04:00
0b4ba4f771
Update history to reflect merge of #1454
2013-08-25 21:34:23 -05:00
56e2bdd0da
Fix two typos in History.markdown
2013-08-25 13:05:52 -04:00
34e3dcdb9f
Update history to reflect merge of #1443
2013-08-24 22:17:37 -05:00
e50217a2ce
Update history to reflect merge of #1444
2013-08-24 11:08:32 -05:00
07d23535af
Update history to reflect the merge of #1430
2013-08-23 18:08:14 +02:00
a91988d436
Update history to reflect merge of #1445
2013-08-22 11:11:16 -05:00
a3b63662ba
Update history to reflect merge of #1439
2013-08-21 22:00:03 -04:00
eeabdd7bec
Update history to reflect merge of #1441
2013-08-21 21:53:02 -04:00
d40e7942c5
Update history to reflect merge of #1389
2013-08-18 10:59:11 -05:00
751ed0ab58
Update history to reflect fixing of #1424 .
2013-08-16 11:56:07 -04:00
c261eeaf6f
Update history to reflect merge of #1415
2013-08-14 03:34:17 +02:00
cb57ede320
Update history to reflect merge of #1418
2013-08-13 19:36:59 -05:00
b039aadec0
Update history to reflect merge of #1419
2013-08-13 19:24:06 -05:00
46f9fe545c
Update history to reflect merge of #1411
2013-08-13 17:11:57 +02:00
a5b035ece8
Update history to reflect merge of #963
2013-08-11 12:52:24 +02:00
4c4a0ca246
Update history to reflect merge of #1408
2013-08-11 12:04:52 +02:00
8d23046524
Update history to reflect merge of #1400
2013-08-09 22:23:44 -05:00
b3e3d8a734
Update history to reflect merge of #1386
2013-08-08 11:41:03 +02:00
bad5ea55d1
Update history to reflect merge of #1397
2013-08-08 11:15:34 +02:00
a87d6f9ddd
Update history to reflect merge of #1390
2013-08-08 00:29:34 +02:00
983c36f557
Update history to reflect merge of #1394
2013-08-07 23:43:41 +02:00
ab0a39fde9
Update history to reflect merge of #1364
2013-08-07 17:13:03 +02:00
a7356f065d
Update history to reflect merge of #1315
2013-08-06 20:12:26 +02:00
fbecb6b875
Update history to reflect closing of #1388 .
2013-08-06 20:08:27 +02:00
14daff8965
Update history to reflect merge of #1382
2013-08-06 18:48:49 +02:00
9193f5ea60
Update history to reflect merge of #1373 .
2013-08-05 01:25:56 +02:00
d08edc4ad6
Update history to reflect merge of #1370
2013-08-03 20:28:00 +02:00
51cf55ebec
Update history to reflect merge of #1358
2013-07-29 12:55:49 -05:00
2fc2558b04
Update history to reflect merge of #1360
2013-07-29 12:42:53 -05:00
8227f5e7b6
Update history to reflect merge of #1356
2013-07-26 10:01:16 -05:00
09e50a5008
Update history to reflect merge of #1354
2013-07-25 13:53:36 -05:00
ec9d6ab693
Update history to reflect merge of #1353
2013-07-25 09:55:19 -05:00
0db5dcf832
Release 1.1.2
2013-07-25 09:15:34 +02:00
49189844ef
Update history to reflect merge of #1349
2013-07-24 20:27:24 -05:00
fe10f21d8d
Release 1.1.1
2013-07-24 22:42:03 +02:00
8e0a4e927f
Update history to reflect merge of #1339
2013-07-23 20:44:11 -05:00
dd4ec1691b
Update history to reflect merge of #1343
2013-07-23 20:37:06 -05:00
8e7b6bf5ff
Update history to reflect merge of #1338
2013-07-23 20:00:27 +02:00
Parker Moore
Matt Rogers
Robin Dupret
Anatol Broder
Benjamin Esham