awesome
/
python
mirror of https://github.com/vinta/awesome-python.git
1
0
Fork 0
Code

change: resolve merge conflicts

This commit is contained in:
thinwybk 2017-01-10 19:52:09 +01:00 committed by GitHub
parent 01aabaad17
commit 86e2da0dfa
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -5,6 +5,12 @@ A curated list of awesome Python frameworks, libraries, software and resources.
Inspired by [awesome-php](https://github.com/ziadoz/awesome-php).
- [Awesome Python](#awesome-python)
- [Admin Panels](#admin-panels)
- [Algorithms and Design Patterns](#algorithms-and-design-patterns)
- [Anti-spam](#anti-spam)
- [Asset Management](#asset-management)
- [Audio](#audio)
- [Authentication](#authentication)
- [Build Tools](#build-tools)
- [Caching](#caching)
- [ChatOps Tools](#chatops-tools)