Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:01:34 +0000 (14:01 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Apr 2017 13:01:34 +0000 (14:01 +0100)
commit14869d2b36336f1fa3e135d83abe64059ad63300
tree626cf7076c755911b8a20318d9a97caf7a5f8cbb
parentfb8c1854eae188200a5815dd097484cc6beaa434
parentf5d913e184c4bd83448d0c20093e079ae7af107a
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
resources/lang/Messages.properties
resources/lang/Messages_es.properties