diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-01-16 12:16:45 -0200 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-01-16 12:16:45 -0200 |
| commit | 402bac079cd32d1260ea839667db639f94f4254e (patch) | |
| tree | 1eaeea3e78200995ad746251a83624b81a99ec35 /test/test-macros.el | |
| parent | 6378af6a432f42b99487631117d3ee781fa17b0b (diff) | |
| parent | 389e433953bba4003b102748dbbf5f8a9b421a51 (diff) | |
Merge branch 'master' into malabarba/fix-display-from-inbox
Conflicts:
sx.el
Diffstat (limited to 'test/test-macros.el')
| -rw-r--r-- | test/test-macros.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/test-macros.el b/test/test-macros.el index 1634603..5e0eac9 100644 --- a/test/test-macros.el +++ b/test/test-macros.el @@ -39,6 +39,5 @@ .page .page_size .quota_max - .quota_remaining - .total) - nil none)))) + .quota_remaining) + nil nil)))) |