Merge branch 'signalr' into develop

This commit is contained in:
Keivan Beigi 2013-09-12 11:12:04 -07:00
commit 93481728cc
233 changed files with 2205 additions and 1813 deletions

View file

@ -1,9 +1,9 @@
{{#if folder.path}}
<div class="row well unmapped-folder-path">
<div class="span11">
{{folder.path}}
</div>
<div class="row well unmapped-folder-path">
<div class="span11">
{{folder.path}}
</div>
</div>
{{/if}}
<div class="row x-search-bar">
<div class="input-prepend nz-input-large add-series-search span11">