about summary refs log tree commit diff
path: root/.gitignore
blob: b01c693c3bee5c36a6556348053c38f18bef4f26 (plain)
1
2
3
4
5
<<<<<<< HEAD
./uploads/*
=======
uploads/
>>>>>>> refs/remotes/origin/master