git://source.jalview.org / proteocache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b154a54 9b9ca01)
Merge branch 'master' into servlets
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 29 Nov 2013 12:20:17 +0000 (12:20 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 29 Nov 2013 12:20:17 +0000 (12:20 +0000)
Conflicts:
WEB-INF/web.xml
website/AllReports.jsp
website/Index.jsp
website/ReportSequenceProtein.jsp


Trivial merge