Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/develop' into chrome-compat
# Conflicts: # scripts/popup.js
- Loading branch information
