diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2014-12-13 00:53:12 +0000 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2014-12-13 00:53:12 +0000 |
| commit | 678510081ece49dc8c12140e8bf4f5b543ea2cfc (patch) | |
| tree | 156a64c887effbdd96d83049bcec14609885898f /sx-load.el | |
| parent | 0b766bb6f949ac583c7cbff90fc172c36795b231 (diff) | |
| parent | 302b5a0cf2222973b901c7856da3920705ebe24e (diff) | |
Merge branch 'master' into use-let-alist
Conflicts:
Cask
Diffstat (limited to 'sx-load.el')
| -rw-r--r-- | sx-load.el | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -25,6 +25,7 @@ sx-time sx-auth sx-button + sx-babel sx-cache sx-compose sx-encoding |