Merge branch 'RossBrunton-develop' into develop

This commit is contained in:
Blade Barringer
2015-08-28 21:42:16 -05:00
8 changed files with 43 additions and 35 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ script(type='text/ng-template', id='modals/member.html')
.container-fluid
.row
.col-md-6
img(ng-show='::profile.profile.imageUrl', ng-src='{{::profile.profile.imageUrl}}')
img.rasterize(ng-show='::profile.profile.imageUrl', ng-src='{{::profile.profile.imageUrl}}')
markdown(ng-show='::profile.profile.blurb', text='::profile.profile.blurb')
ul.muted.list-unstyled(ng-if='::profile.auth.timestamps')
li {{profile._id}}