HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2013-10-04 19382d873642db2f282204d8658cfa1b14545e65
refs
author Peter Hormanns <peter.hormanns@jalin.de>
Friday, October 4, 2013 20:08 +0200
committer Peter Hormanns <peter.hormanns@jalin.de>
Friday, October 4, 2013 20:19 +0200
commit19382d873642db2f282204d8658cfa1b14545e65
tree e4b4f0a9e3b4503131996c5c87a072d6d8faaf74 tree | zip | gz
parent a385cdddf7aa478078df1b5195ca214a5e2583be view | diff
987ac622b15f7d53272bcc62d0051c007661138d view | diff
Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Conflicts:
hsarweb/src/de/hsadmin/web/AbstractModule.java
2 files modified
3 ■■■■ changed files
hsarweb/conf/WEB-INF/web.xml 1 ●●●● diff | view | raw | blame | history
hsarweb/src/de/hsadmin/web/AbstractModule.java 2 ●●● diff | view | raw | blame | history