Skip to content
Snippets Groups Projects

Develop

Merged Tor-Einar Skog requested to merge develop into master
1 file
+ 3
2
Compare changes
  • Side-by-side
  • Inline
/*
/*
* Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
* Copyright (c) 2019 NIBIO <http://www.nibio.no/>.
*
*
* This file is part of VIPSLogic.
* This file is part of VIPSLogic.
* VIPSLogic is free software: you can redistribute it and/or modify
* VIPSLogic is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
@@ -20,7 +20,7 @@
package no.nibio.vips.logic.util;
package no.nibio.vips.logic.util;
/**
/**
* @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
* @copyright 2019 <a href="http://www.nibio.no/">NIBIO</a>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
*/
public class Globals {
public class Globals {
@@ -78,6 +78,7 @@ public class Globals {
@@ -78,6 +78,7 @@ public class Globals {
"Europe/Riga",
"Europe/Riga",
"Europe/Vilnius",
"Europe/Vilnius",
"Europe/Sofia",
"Europe/Sofia",
 
"Europe/Zurich",
"America/Los_Angeles"
"America/Los_Angeles"
};
};
Loading