diff options
author | Sean Allred <code@seanallred.com> | 2014-11-14 17:25:27 -0500 |
---|---|---|
committer | Sean Allred <code@seanallred.com> | 2014-11-14 17:30:21 -0500 |
commit | 1e859ea6d9b5365f69f8dea5d690e6bee8350e7a (patch) | |
tree | 7f7da64a833f8c1c783b6d4977fc79f06d227d1d /Cask | |
parent | 403c021d92bb036be5d95735bc1403056db3780b (diff) | |
parent | 22cc1b1b959761cda2ff2048dbaeba99cc094930 (diff) |
Merge branch 'master' into network-list
Conflicts:
sx-filter.el
sx-question.el
Diffstat (limited to 'Cask')
-rw-r--r-- | Cask | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -8,6 +8,7 @@ (depends-on "json" "1.4") (depends-on "url") (depends-on "cl-lib") +(depends-on "markdown-mode") (development (depends-on "ert")) |