diff .gitignore @ 30:e32c7c349af6

Merge branch 'master' of https://github.com/amsehili/auditok Conflicts: README.md
author Amine Sehili <amine.sehili@gmail.com>
date Sun, 29 Nov 2015 11:56:24 +0100
parents 364eeb8e8bd2
children eb17a4e1dc83
line wrap: on
line diff