Skip to content
Commit 1bead918 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza base, limita recursos y transforma dev

See merge request redmic-project/server/ais!4
parents 7c211346 cc2e5f28
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