Roberto Rosario 14533da646 Merge branch 'master' into feature/sane_source ...

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

2017-06-16 18:15:12 -04:00

..

acls

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

appearance

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

authentication

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

cabinets

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

checkouts

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

common

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

converter

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

django_gpg

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

document_comments

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

document_indexing

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

document_signatures

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

document_states

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

documents

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

dynamic_search

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

events

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

folders

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

linking

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

lock_manager

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

mailer

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

metadata

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

mimetype

Rename the licenses modules from packages.py to licenses.py

2016-11-12 23:59:50 -04:00

mirroring

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

motd

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

navigation

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

ocr

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

permissions

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

rest_api

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

smart_settings

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

sources

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

statistics

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

storage

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

tags

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

user_management

Merge branch 'master' into feature/sane_source

2017-06-16 18:15:12 -04:00

__init__.py

Move common templates to apps/main/templates/main/*

2014-08-26 02:44:49 -04:00