Skip to content
Snippets Groups Projects

Rama postgres

Merged Rama postgres
ramaPostgres into rama3
Merged
ginquinrequested to merge
ramaPostgres into rama3
Viewing commit 6ac27379
Prev
Show latest version
1 file
+ 1
− 1
Compare changes
  • Side-by-side
  • Inline
  • 6ac27379
    ginquin
    Merge branch 'rama3' into 'ramaPostgres' · 6ac27379
    ginquin authored 
    # Conflicts:
#   src/main/java/es/uva/inf/tfg/ginquin/smellswisdom/controller/LoginResponsiveController.java
#   src/main/webapp/css/template.zul
#   src/main/webapp/login.zul
src/main/webapp/login.zul
+ 1
− 1
<?taglib uri="http://www.zkoss.org/dsp/web/theme" prefix="t"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/css/template.zul"?>
<?taglib uri="/WEB-INF/security.tld" prefix="sec"?>
<zk>
<div apply="es.uva.inf.tfg.ginquin.smellswisdom.controller.LoginResponsiveController">
<box id="content" self="@define(content)" orient="horizontal"