Убираем из индекса всякий мусор

Merge branch 'develop' of https://github.com/torrentpier/tracker into develop

Conflicts:
	library/config.php
	library/includes/sessions.php
This commit is contained in:
PheRum 2014-12-06 19:51:36 +03:00
commit 8d6eeece8e

4
.gitignore vendored
View file

@ -1,6 +1,6 @@
### TorrentPier ### ### TorrentPier ###
.idea/ .idea/
data/avatars/**/ data/avatars/
data/old_files/ data/old_files/
data/torrent_files/ data/torrent_files/
internal_data/ajax_html/*.html internal_data/ajax_html/*.html
@ -32,3 +32,5 @@ $RECYCLE.BIN/
._* ._*
.Spotlight-V100 .Spotlight-V100
.Trashes .Trashes
*.orig
*.rej