From 8d6eeece8ebf1fc9e796e4b42ac0ca3774efcf2d Mon Sep 17 00:00:00 2001
From: PheRum <pherum@mail.ru>
Date: Sat, 6 Dec 2014 19:51:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA=D1=81=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=81=D1=8F=D0=BA=D0=B8=D0=B9=20=D0=BC=D1=83=D1=81=D0=BE?=
 =?UTF-8?q?=D1=80=20Merge=20branch=20'develop'=20of=20https://github.com/t?=
 =?UTF-8?q?orrentpier/tracker=20into=20develop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts:
	library/config.php
	library/includes/sessions.php
---
 .gitignore | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d43b14c3..49e80b6e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 ### TorrentPier ###
 .idea/
-data/avatars/**/
+data/avatars/
 data/old_files/
 data/torrent_files/
 internal_data/ajax_html/*.html
@@ -31,4 +31,6 @@ $RECYCLE.BIN/
 .LSOverride
 ._*
 .Spotlight-V100
-.Trashes
\ No newline at end of file
+.Trashes
+*.orig
+*.rej
\ No newline at end of file