Fixed merge conflicts

2014-07-18 20:35:15 -06:00
parent 21ec7bb82a
commit 1efe20fe42
41 changed files with 1185 additions and 105 deletions
@@ -0,0 +1,6 @@
+= link_to organization do
+	%figure.org-mini-preview{:class => (organization.avatar.is_landscape? ? 'landscape' : 'portrait')}
+		= image_tag organization.avatar.preview.url
+		%figcaption
+			%h5= organization.name
+			%p= location(organization.locations[0])