bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:fetsite/fetsite

Browse Source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Andreas Stephanides
2014-02-23 14:30:26 +01:00
parent aa2ef0955c 14b42ef33a
commit 28dd49bbee
5 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,4 +1,8 @@
/usergroup.ldif
/newuser.ldif
/passwd.ldif
/config/omniauth_secrets.yml
/config/database.yml
/config/initializers/omniauth_secrets.rb
# See http://help.github.com/ignore-files/ for more about ignoring files.
#