Merge branch 'master' of https://github.com/camillem/osem

2016-03-26 23:37:35 +01:00 · 2016-03-26 23:37:35 +01:00 · c5da563a48
commit c5da563a48
parent d11ea33cf0 10ef898a0d
105 changed files with 2052 additions and 3881 deletions
--- a/app/views/conference/_social_media.html.haml
+++ b/app/views/conference/_social_media.html.haml
@ -17,3 +17,6 @@
      - unless @conference.contact.googleplus.blank?
        = link_to "#{ @conference.contact.googleplus }" do
          %i.fa.fa-google-plus-square.fa-4x
+      - unless @conference.contact.email.blank?
+        = mail_to "#{ @conference.contact.email }" do
+          %i.fa.fa-envelope-o.fa-4x