Skip to content
Snippets Groups Projects
Commit c8aa4ab8 authored by Nicolás Reynolds's avatar Nicolás Reynolds
Browse files

Merge branch 'revision' of git://noanoa.local/endefensadelsl.org into revision 

Conflicts:
	_posts/2012-11-18-tesis_sobre_el_trabajo_digital.markdown
	_posts/2012-11-19-guerrilla_del_acceso_abierto.markdown
parents 2150da22 ce49c188
Branches
No related tags found
No related merge requests found
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