Merge branch 'develop' of https://github.com/ClouDev/CloudBot into develop

This commit is contained in:
Luke Rogers 2013-08-01 10:30:55 +12:00
commit 78173b7f63

3
.gitignore vendored
View file

@ -7,7 +7,6 @@ gitflow
*.pyc *.pyc
*.orig *.orig
.project .project
.pydevproject
.geany .geany
*.sublime-project *.sublime-project
*.sublime-workspace *.sublime-workspace