valdevir 45fd6c7d3d Merge remote-tracking branch 'remotes/origin/master' into fixBug_AL-3854 ... # Conflicts: # pom.xml # web/WEB-INF/i3-label_pt_BR.label		2024-05-09 16:53:16 -03:00
..
i3-label_en.label	fix bug#AL_3854	2024-05-08 14:44:17 -03:00
i3-label_es_MX.label	fix bug#AL_3854	2024-05-08 14:44:17 -03:00
i3-label_fr_FR.label	fix bug#AL_3854	2024-05-08 14:44:17 -03:00
i3-label_pt_BR.label	fixes bug #AL-4298	2024-05-09 15:58:51 -03:00
jboss-deployment-structure.xml	fixes bug #AL-3470	2024-02-20 15:39:57 -03:00
lang-addon.xml	copia do projeto scia	2012-06-27 18:01:07 +00:00
portlet.xml	asdfdsa	2016-02-25 23:09:35 +00:00
web.xml	Definir o banco (Principal/Replica) por método	2019-09-27 19:45:12 +00:00
weblogic.xml	copia do projeto scia	2012-06-27 18:01:07 +00:00
zk.xml	fixes bug#14828	2019-07-12 00:18:40 +00:00