fixing merge issue

This commit is contained in:
Matthias Strubel 2013-04-09 08:02:00 +02:00
parent 410e6d835e
commit 790b50740f

3
.gitignore vendored
View file

@ -3,6 +3,7 @@
piratebox/piratebox/version
piratebox/piratebox/www/chat_content.html
image_stuff/*
piratebox/piratebox/bin/miniircd.py
piratebox_ws_*
piratebox-ws_*
tmp/*
piratebox/piratebox/bin/miniircd.py