Merge remote-tracking branch 'origin/master' into rustedbuilds

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	test/data/test.db
This commit is contained in:
jakedt 2014-02-21 14:52:40 -05:00
commit d5304f7db0
128 changed files with 845 additions and 207343 deletions

View file

@ -9,7 +9,8 @@
</div>
<div class="alert alert-warning" ng-show="limit == 'at' && !planLoading">
You are at your current plan's number of allowed private repositories. Please upgrade your subscription to avoid future disruptions in your <span ng-show="organization">organization's</span> service.
You are at your current plan's number of allowed private repositories. It might be time to think about
upgrading your subscription to avoid future disruptions in your <span ng-show="organization">organization's</span> service.
</div>
<div class="alert alert-success" ng-show="limit == 'near' && !planLoading">