Changeset [4e201f2c1ff6b2ef721804eb3549cd3f14f6dcf7] by Ed Lee
Revision 4e201f2c1ff6b2ef721804eb3549cd3f14f6dcf7,
committed by Ed Lee
· June 3rd, 2014 @ 09:57 AM
Merge branch 'master' of github.com:GMOD/Apollo
https://github.com/GMOD/jbrowse/commit/4e201f2c1ff6b2ef721804eb3549...
6 changed files
-
A
server/WebApollo/WebContent/configSetup.jsp -
M
client/apollo/js/View/Track/AnnotTrack.js -
M
server/WebApollo/src/net/crackstation/PasswordHash.java -
M
server/WebApollo/src/org/bbop/apollo/web/user/UserManager.java -
M
server/WebApollo/tools/user/add_user.pl -
M
server/WebApollo/tools/user/change_user_password.pl