Changeset [04dfec9c973445afffe808f8eb66617fe436234a] by Robert Buels
Revision 04dfec9c973445afffe808f8eb66617fe436234a,
committed by Robert Buels
· October 22nd, 2013 @ 11:58 AM
Merge branch 'basespace' into subtracks_semzoom
Conflicts:
themes/base/keyring.css themes/base/scss/keyring.scss
https://github.com/GMOD/jbrowse/commit/04dfec9c973445afffe808f8eb66...
9 changed files
-
A
src/JBrowse/Auth/CredentialSlot/_OAuth2Base.js -
M
src/JBrowse/Auth/CredentialSlot/Google.js -
M
src/JBrowse/Auth/OAuth2/Token.js -
M
src/JBrowse/Auth/_AuthManagerMixin.js -
M
src/JBrowse/Browser.js -
M
src/JBrowse/Transport/HTTP.js -
M
src/JBrowse/View/Auth/Keyring/CredentialWidget.js -
M
src/JBrowse/_ConfigurationMixin.js -
M
themes/base/scss/keyring.scss