PWV-1: Fixing merging issues

This commit is contained in:
Bruno Alves de Faria authored and Erik Ziegler committed 2016-11-15 08:24:30 +01:00
1 parent 481bf30a14
commit db0602def7
29 files changed
+392 -488

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
<template name="app">
<div class="topBar noselect {{#if onStudyList}}studyList{{/if}}">
<div class="clearfix p-x-1 p-t-1">
<div class="clearfix">
<a target='_blank'
class="brandSection pull-left"
href="http://ohif.org">