Skip to content
Commit 13c845ef authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza unsee a karma, añade phpldapadmin

See merge request redmic-project/index-page/redmic-pro!7
parents da009142 ffd5d371
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment