summaryrefslogtreecommitdiff
path: root/users/app/views/webfinger/search.xml.erb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-05-16 08:42:36 +0200
committerAzul <azul@leap.se>2014-05-16 08:42:36 +0200
commit8fbbb8717f0578536b97c2dc0883c632f120e976 (patch)
tree17aeb2b48ada703ac916a9a65fbf3c75a5dadb86 /users/app/views/webfinger/search.xml.erb
parent81555ec6244ed76f92e3629880f68104b8705817 (diff)
parenta4f7a410c536d88c91c834cab6ee950c71005ddd (diff)
Merge remote-tracking branch 'origin/develop'
Conflicts: app/assets/javascripts/srp test/nagios/soledad_sync.py test/nagios/webapp_login.py
Diffstat (limited to 'users/app/views/webfinger/search.xml.erb')
-rw-r--r--users/app/views/webfinger/search.xml.erb7
1 files changed, 0 insertions, 7 deletions
diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb
deleted file mode 100644
index 7328552..0000000
--- a/users/app/views/webfinger/search.xml.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
- <Subject><%= @presenter.subject %></Subject>
- <%- @presenter.links.each do |rel, link| %>
- <Link rel=<%=rel%> type=<%=link[:type]%> href="<%= link[:key] %>"/>
- <% end %>
-</XRD>