diff options
author | Don Bowman <don.waterloo@gmail.com> | 2015-08-12 21:10:00 +0000 |
---|---|---|
committer | Don Bowman <don.waterloo@gmail.com> | 2015-08-12 21:10:00 +0000 |
commit | 1cb46ede1acf4f8527e64fcae7e92672cad764b2 (patch) | |
tree | fabb54ee5f040be2a4ee5c95f87cb3e9fbf7bdea /conf/gitignore/PHP FuelPHP | |
parent | 9e6bd31d76aa6d6495a2144466af78773f34d07c (diff) | |
parent | aede5cdb04fdbf74d9c602062fdece9f408e90f4 (diff) |
Merge branch 'master' of https://github.com/gogits/gogs
Conflicts:
routers/repo/download.go
Diffstat (limited to 'conf/gitignore/PHP FuelPHP')
-rw-r--r-- | conf/gitignore/PHP FuelPHP | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/gitignore/PHP FuelPHP b/conf/gitignore/PHP FuelPHP new file mode 100644 index 00000000..7804d8d2 --- /dev/null +++ b/conf/gitignore/PHP FuelPHP @@ -0,0 +1,2 @@ +fuel/app/logs/*/*/* +fuel/app/cache/*/* |