commit bcf5c899df02a6d824a886a02988f8de54c6249e parent d2c6a624d8ee9778719c5b113171674a9b50ca30 Author: Gaute Hope <eg@gaute.vetsj.com> Date: Fri, 3 May 2013 14:46:03 +0200 Merge branch 'develop' into remove-server Diffstat:
| M | .gitignore | | | 2 | ++ |
1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore @@ -5,3 +5,5 @@ *~ # i use rake package task pkg/ +# i have accidently added this one one too many times +sup-exception-log.txt