Skip to content
GitLab
Explore
Sign in
Milan
diaspora
Repository
diaspora
script
server
Find file
Blame
History
Permalink
Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of
https://github.com/Dorian/diaspora
· 60c0c4dc
MrZYX
authored
Jan 27, 2011
Conflicts: script/server
60c0c4dc