diff options
author | Leif Johansson <leifj@sunet.se> | 2011-08-01 11:35:10 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2011-08-01 11:35:10 +0200 |
commit | e54fabf198f50546b093753900d3a41fa7535181 (patch) | |
tree | bcd4952415c938101ae168efc2dcb2b550369e23 /src/installer/resources/install.properties | |
parent | 6c67f4c3050fa01d1b8e04f334cb8dd2293b39d0 (diff) | |
parent | bd0c52acfb796b5a8cd85c2f535e7e874f558f3a (diff) |
Merge branch 'trunk' into idp.nordu.net
Conflicts:
src/main/webapp/wayf.jsp
Diffstat (limited to 'src/installer/resources/install.properties')
-rw-r--r-- | src/installer/resources/install.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties index 4b9d0de..c37d1c1 100644 --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1 +1 @@ -ds.home = /opt/shibboleth-ds
\ No newline at end of file +ds.home = /etc/DiscoveryService
\ No newline at end of file |