resolve conflicts from merge with staging

2018-06-20 14:29:13 +02:00
parent d03339f20b a5b207d57b
commit c3741f847d
12 changed files with 413 additions and 113 deletions
--- a/www/common/outer/store-rpc.js
+++ b/www/common/outer/store-rpc.js
@@ -71,6 +71,7 @@ define([
            JOIN_PAD: Store.joinPad,
            LEAVE_PAD: Store.leavePad,
            GET_FULL_HISTORY: Store.getFullHistory,
+            GET_HISTORY_RANGE: Store.getHistoryRange,
            IS_NEW_CHANNEL: Store.isNewChannel,
            // Drive
            DRIVE_USEROBJECT: Store.userObjectCommand,