Merge branch 'master' of git+ssh://gitosis@nomeata.de/L-seed
authorSven Hecht <sven@sven-laptop.(none)>
Fri, 26 Jun 2009 16:55:24 +0000 (18:55 +0200)
committerSven Hecht <sven@sven-laptop.(none)>
Fri, 26 Jun 2009 16:55:24 +0000 (18:55 +0200)
Conflicts:
web/setup/script00.sql

1  2 
web/js/communication.js
web/php/page/myplants.pg
web/php/page/nav.pg

Simple merge
Simple merge
                id: 'myplants'
                ,text: "Meine Pflanzen"
                ,leaf: true
-       },{
-               id: 'testplant'
-               ,text: "Pflanze testen"
-               ,leaf: true
        },{
                id: 'season'
 -              ,text: "Aktuelle Saison"
 +              ,text: "Aktuelle Staffel"
                ,leaf: true
        }]
  }