Commit 695b4c57 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Reubica recursos en lugar original, corrige labels

See merge request redmic-project/static-pages!10
parents 5ff75b17 9be94685
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment