diff options
author | Jonne Hass <mrzyx@mrzyx.de> | 2011-09-14 16:02:28 +0400 |
---|---|---|
committer | Jonne Hass <mrzyx@mrzyx.de> | 2011-09-14 16:02:28 +0400 |
commit | c6502a7c7ac27a319e4b71c47b771edab268dcd3 (patch) | |
tree | 662a4c8f94bc5b6eb24fb62ce8e5d0a4873f8dd4 /app/views/contacts/sharing.haml | |
parent | d7a71544240025f98d1c08b6738bab576a8695f2 (diff) | |
parent | e25dd94d637168d6a8f35bfcdb190b36d40e31ce (diff) |
Merge branch '1395-mysql2-ruby1.9-bug' of https://github.com/Flink/diaspora
Diffstat (limited to 'app/views/contacts/sharing.haml')
0 files changed, 0 insertions, 0 deletions