andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Andreas Stephanides
2014-04-13 15:55:25 +02:00
parent 0cc90eb220 b6e69925db
commit 99b6f3968a
36 changed files with 242 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -29,6 +29,7 @@ Gemfile.lock
console
/server
/public/uploads/
/vendor/*
/bak/*
*#
Gemfile.lock