HSAdmin Backend Domains, E-Mail, Datenbanken
parent: 71af06 | patch | commitdiff
Peter Hormanns
2012-08-16 f0df8fb9a6b69b8cf2efed06d53aaa43df8d2e67
refs
author Peter Hormanns <peter.hormanns@jalin.de>
Thursday, August 16, 2012 18:37 +0200
committer Peter Hormanns <peter.hormanns@jalin.de>
Thursday, August 16, 2012 18:37 +0200
commitf0df8fb9a6b69b8cf2efed06d53aaa43df8d2e67
tree 91cd9dd8e2212836d3e7b2385f3bc36ba2f4fde3 tree | zip | gz
parent 71af063354101dc8a324683665ae4211e24f0a01 view | diff
06a487819fd0d58143ce5ca645e8f1e06d01588a view | diff 
Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/

Conflicts:
	hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
	hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
1 files modified
6 ■■■■■ changed files
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java 6 ●●●●● diff | view | raw | blame | history