Roberto Rosario 3bbef4253a Merge branch 'features/mercs_5_6' into 3_way_merge ...

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>

2019-03-21 19:48:13 -04:00

..

__init__.py

Add first set of Django 1.7 app migrations

2015-03-30 05:08:50 -04:00

0001_initial.py

Migrations: Squash migrations

2018-12-08 03:02:04 -04:00

0002_auto_20150608_1902.py

Migrations: Squash migrations

2018-12-08 03:02:04 -04:00

0003_auto_20150614_0723.py

Various apps: Sort imports

2018-12-06 01:57:24 -04:00

0004_delete_anonymoususersingleton.py

Various apps: Sort imports

2018-12-06 01:57:24 -04:00

0005_auto_20150706_1832.py

Various apps: Sort imports

2018-12-06 01:57:24 -04:00

0006_auto_20160313_0313.py

Migrations: Squash migrations

2018-12-08 03:02:04 -04:00

0007_auto_20170118_1758.py

Migrations: Remove superfluous code comments

2018-12-14 02:35:24 -04:00

0008_errorlogentry.py

Migrations: Squash migrations

2018-12-08 03:02:04 -04:00

0009_auto_20180402_0339.py

Migrations: Squash migrations

2018-12-08 03:02:04 -04:00

0010_auto_20180403_0702_squashed_0011_auto_20180429_0758.py

Migrations: Squash migrations

2018-12-08 03:02:04 -04:00

0010_auto_20180403_0702.py

Various apps: Sort imports

2018-12-06 01:57:24 -04:00

0011_auto_20180429_0758.py

Various apps: Sort imports

2018-12-06 01:57:24 -04:00

0012_auto_20181229_0738.py

Merge branch 'features/mercs_5_6' into 3_way_merge

2019-03-21 19:48:13 -04:00