Changeset [8096454f849156cf06c618ef7d21e3ddc006854a] by Colin
Revision 8096454f849156cf06c618ef7d21e3ddc006854a,
committed by Colin
· June 13th, 2014 @ 10:31 AM
Merge branch 'master' of https://github.com/GMOD/Apollo
Conflicts:
client/apollo/js/View/Track/AnnotTrack.js
https://github.com/GMOD/jbrowse/commit/8096454f849156cf06c618ef7d21...
7 changed files
-
A
server/WebApollo/src/org/bbop/apollo/web/tools/RemoveIsoforms.java -
A
server/WebApollo/tomcat/custom-valves.jar -
M
client/apollo/js/View/Track/AnnotTrack.js -
M
server/WebApollo/src/org/bbop/apollo/web/Login.java -
M
server/WebApollo/src/org/bbop/apollo/web/dataadapter/chado/ChadoIO.java -
M
server/WebApollo/src/org/bbop/apollo/web/user/UserManager.java -
M
server/WebApollo/src/org/bbop/apollo/web/user/localdb/LocalDbUserAuthentication.java