Skip to content
GitLab
Explore
Sign in
Projects
OHR Support
Repository
ohr-support
lib
chili_project
compatibility.rb
Find file
Blame
History
Permalink
Merge branch 'master' into unstable
· 1d21cab2
Felix Schäfer
authored
Dec 01, 2011
Conflicts: app/views/projects/index.rhtml lib/chili_project/compatibility.rb
1d21cab2