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 /doc/api/resources | |
| parent | 6c67f4c3050fa01d1b8e04f334cb8dd2293b39d0 (diff) | |
| parent | bd0c52acfb796b5a8cd85c2f535e7e874f558f3a (diff) | |
Merge branch 'trunk' into idp.nordu.net
Conflicts:
src/main/webapp/wayf.jsp
Diffstat (limited to 'doc/api/resources')
| -rw-r--r-- | doc/api/resources/inherit.gif | bin | 57 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/api/resources/inherit.gif b/doc/api/resources/inherit.gif Binary files differdeleted file mode 100644 index c814867..0000000 --- a/doc/api/resources/inherit.gif +++ /dev/null |
