Skip to content

D
django-rest-framework
Commit 2f54decd by Tom Christie
Options

Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

parents e939e175 599c0eb0
Showing with 6 additions and 8 deletions
docs/topics/credits.md
......@@ -122,6 +122,7 @@ The following people have helped make REST framework great.
* Daniel Hepper - [dhepper]
* Hamish Campbell - [hamishcampbell]
* Marlon Bailey - [avinash240]
* James Summerfield - [jsummerfield]
Many thanks to everyone who's contributed to the project.
......@@ -280,3 +281,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter.
[dhepper]: https://github.com/dhepper
[hamishcampbell]: https://github.com/hamishcampbell
[avinash240]: https://github.com/avinash240
[jsummerfield]: https://github.com/jsummerfield
rest_framework/templates/rest_framework/login_base.html
......@@ -12,9 +12,8 @@
<body class="container">
<div class="container-fluid" style="margin-top: 30px">
<div class="container-fluid" style="margin-top: 30px">
<div class="row-fluid">
<div class="well" style="width: 320px; margin-left: auto; margin-right: auto">
<div class="row-fluid">
<div>
......@@ -44,12 +43,9 @@
</div>
</form>
</div>
</div><!-- /row fluid -->
</div><!--/span-->
</div><!-- /.row-fluid -->
</div>
</div>
</div><!--/.well-->
</div><!-- /.row-fluid -->
</div><!-- /.container-fluid -->
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment