Enrique Camargo 6b4a15534d Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' ... # Conflicts: # pandora_console/extras/mr/6.sql		2017-08-31 18:21:08 +02:00
..
.gitignore	added file.	2017-03-08 11:44:49 +01:00
1.sql	New feature: Graphic grouping. added mr	2017-05-23 17:17:40 +02:00
2.sql	Replaced procedures with prepared statements.	2017-06-15 15:43:00 +02:00
3.sql	Add a missing MR.	2017-06-15 13:47:20 +02:00
4.sql	Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'	2017-07-18 12:24:49 +02:00
5.sql	mr-5 add queries	2017-08-07 13:57:04 +02:00
6.sql	Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR'	2017-08-31 18:21:08 +02:00