Alberto Miranda 96e7e83e20 Merge branch 'master' into playback-priority ...

# Conflicts:
#	src/renderer/controllers/playback-controller.js
#	src/renderer/controllers/torrent-list-controller.js
#	src/renderer/main.js

2017-03-14 19:43:57 -03:00

13 KiB

Raw Blame History

View Raw