Merge branch 'master' into merge_master

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-08-22 03:18:30 -04:00
119 changed files with 1782 additions and 1443 deletions

View File

@@ -280,7 +280,7 @@ class UploadInteractiveView(UploadBaseView):
messages.success(
self.request,
_(
'New document queued for uploaded and will be available '
'New document queued for upload and will be available '
'shortly.'
)
)
@@ -415,7 +415,7 @@ class UploadInteractiveVersionView(UploadBaseView):
messages.success(
self.request,
_(
'New document version queued for uploaded and will be '
'New document version queued for upload and will be '
'available shortly.'
)
)