Junior d3081f81f3 corrige conflitos

2025-03-06 12:10:17 -03:00

..

__init__.py

corrige conflitos

2025-03-06 12:10:17 -03:00

conf.py

corrige conflitos

2025-03-06 12:10:17 -03:00

howto.rst

corrige conflitos

2025-03-06 12:10:17 -03:00

index.rst

corrige conflitos

2025-03-06 12:10:17 -03:00

make.bat

corrige conflitos

2025-03-06 12:10:17 -03:00

Makefile

corrige conflitos

2025-03-06 12:10:17 -03:00

users.rst

corrige conflitos

2025-03-06 12:10:17 -03:00