diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-01-16 13:30:58 -0200 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-01-16 13:30:58 -0200 |
| commit | 006c85d3a241e20b6b03ab4499dbc467f8431ddd (patch) | |
| tree | 4799ce852da6e4308080669aa577906ef56f8bbc /test | |
| parent | bed5191a0137cb115656baf6ae3535b2a646d0b2 (diff) | |
| parent | 389e433953bba4003b102748dbbf5f8a9b421a51 (diff) | |
Merge branch 'master' into tag-buttons
Conflicts:
sx-question.el
Diffstat (limited to 'test')
| -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)))) |