1
0
mirror of https://github.com/cydrobolt/polr.git synced 2024-11-09 19:52:28 +01:00

Merge branch '2.0-dev' of github.com:cydrobolt/polr into 2.0-dev

This commit is contained in:
Chaoyi Zha 2016-02-13 22:53:56 -05:00
commit 10cbd90883

View File

@ -4,8 +4,7 @@
:aerial_tramway: A modern, minimalist, and lightweight URL shortener. :aerial_tramway: A modern, minimalist, and lightweight URL shortener.
[![GitHub license](https://img.shields.io/badge/license-GPLv2%2B-blue.svg)]() [![GitHub license](https://img.shields.io/badge/license-GPLv2%2B-blue.svg)]()
[![2.0 status](https://img.shields.io/badge/devel-2.0-red.svg)]() [![Builds status](https://travis-ci.org/cydrobolt/polr.svg)](https://travis-ci.org/cydrobolt/polr)
[![GitHub release](https://img.shields.io/badge/stable-1.4.1-blue.svg)]()
[![Docs](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](http://polr.readthedocs.org/en/2.0-dev/) [![Docs](https://img.shields.io/badge/docs-latest-brightgreen.svg?style=flat)](http://polr.readthedocs.org/en/2.0-dev/)
Welcome to Polr's 2.0 development branch. Welcome to Polr's 2.0 development branch.