commit 6a1de2926782ad0ca861b078c31ad3de2bc6e172 parent 6317c25b10f3d885c8ccc3374fb1e873e2c18f44 Author: RobinLinus <robinlinus@users.noreply.github.com> Date: Fri, 21 Sep 2018 19:15:31 +0200 Merge branch 'dev' of github.com:RobinLinus/snapdrop into dev # Conflicts: # client/scripts/network.js