Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Thu, 5 Dec 2013 09:20:42 +0000 (09:20 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Thu, 5 Dec 2013 09:20:42 +0000 (09:20 +0000)
commitc7b32cc1f17ec534d5b98ed27cc2f3a4b52daad6
tree7ad072fc110600e454834dfc305ff77587df5109
parentde3f241669f5f2bfd8258e87cbd0b19402950f32
parent574c70838a48dd41cfadda11a493b04f02de5604
Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets

Conflicts:
server/compbio/controllers/SequenceController.java
server/compbio/controllers/DailyStatisticsController.java
server/compbio/controllers/SequenceController.java
webapp/view/reportJobStatistics.jsp