seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Brian Smith 2014-02-20 20:46:54 -05:00
parent c619d867ef fa1e554bf7
commit f85f0fa956
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/views/users/_feed_item.html.erb
View File

@ -2,7 +2,7 @@
<%= content_tag(:div, :class => "feed-entry") do %>
<!-- avatar -->
<%= content_tag(:div, image_tag(src="images/content/avatar_band1.jpg")) %>
<%= content_tag(:div, image_tag(src="content/avatar_band1.jpg")) %>
<!--<div class="avatar-small ib"><img src="images/content/avatar_band1.jpg"></div>-->
<!-- type and artist -->

2
web/app/views/users/welcome.html.erb
View File

@ -26,7 +26,7 @@
<%= content_tag(:div, :class => "home-questions") do -%>
Have questions about how JamKazam works?
<a href="#" id="faq-open">Here are some answers</a>.
<a id="faq-open" href="https://jamkazam.desk.com/customer/portal/articles/1305119-frequently-asked-questions-faq" target="_blank">Here are some answers</a>.
<% end %>
<% end %>
<% end %>