Merge remote-tracking branch 'origin/master' into swaggerlikeus
Conflicts: endpoints/api.py
This commit is contained in:
commit
5f98bf8dab
5 changed files with 23 additions and 11 deletions
|
@ -143,4 +143,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="border-top: 1px solid #eee; padding-top: 20px;">
|
||||
<a href="https://mixpanel.com/f/partner"><img src="//cdn.mxpnl.com/site_media/images/partner/badge_light.png" alt="Mobile Analytics" /></a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Reference in a new issue