Merge remote-tracking branch 'origin/peon'

Conflicts:
	Dockerfile
This commit is contained in:
jakedt 2014-04-17 13:03:40 -04:00
commit 56a19aa24e
19 changed files with 170 additions and 28833 deletions

View file

@ -1,5 +1,5 @@
<button class="btn btn-success" data-trigger="click"
data-content-template="static/directives/popup-input-dialog.html"
data-content-template="/static/directives/popup-input-dialog.html"
data-placement="bottom" ng-click="popupShown()" bs-popover>
<span ng-transclude></span>
</button>