← Back to branch summary

~developer-ubuntu-com-dev/developer-ubuntu-com/staging

~developer-ubuntu-com-dev/developer-ubuntu-com/staging

Viewing all changes in revision 174.

Committer: David Callé
Date: 2016-04-18 21:41:27 UTC
mfrom: (137.1.74 trunk)
Revision ID: davidc@framli.eu-20160418214127-0c83m4gmlcsh603r

Merge trunk

files added:
md_importer/migrations/0003_add_herotour_template.py

md_importer/migrations/0004_move_from_page_object_to_url_string.py

md_importer/tests/test_article.py

files modified:
locale/de.po

locale/en_GB.po

locale/es.po

locale/pt.po

locale/ug.po

locale/zh_CN.po

md_importer/importer/article.py

md_importer/importer/process.py

md_importer/importer/publish.py

md_importer/importer/repo.py

md_importer/management/commands/import_md.py

md_importer/models.py

md_importer/tests/test_branch_fetch.py

md_importer/tests/test_branch_import.py

md_importer/tests/test_import_process.py

md_importer/tests/test_link_rewrite.py

md_importer/tests/test_misc.py

md_importer/tests/test_snappy_import.py

md_importer/tests/test_utils.py

md_importer/tests/test_website_import.py

md_importer/tests/utils.py

requirements.txt

templates/website_base.html

Show diffs side-by-side

added added

removed removed

locale/en_GB.po

locale/zh_CN.po

md_importer/importer/article.py

md_importer/importer/process.py

md_importer/importer/publish.py

md_importer/importer/repo.py

md_importer/management/commands/import_md.py

md_importer/migrations/0003_add_herotour_template.py

md_importer/migrations/0004_move_from_page_object_to_url_string.py

md_importer/models.py

md_importer/tests/test_article.py

md_importer/tests/test_branch_fetch.py

md_importer/tests/test_branch_import.py

md_importer/tests/test_import_process.py

md_importer/tests/test_link_rewrite.py

md_importer/tests/test_misc.py

md_importer/tests/test_snappy_import.py

md_importer/tests/test_utils.py

md_importer/tests/test_website_import.py

md_importer/tests/utils.py

requirements.txt

templates/website_base.html

Older »