Skip to content
GitLab
Explore
Sign in
sysadmin
etherpad
Repository
etherpad
README.md
Find file
Blame
History
Permalink
Merge branch 'release/1.2.12'
· 76bd25ac
Marcel Klehr
authored
Oct 12, 2013
Conflicts: README.md
76bd25ac