Merge branch 'refs/heads/master' into dev-archive-discussions
Merge branch 'refs/heads/master' into dev-archive-discussions
Merge branch 'refs/heads/master' into dev-archive-discussions
Broken Link

Fixed broken link in README.md

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-support' into dev-archive-discussions
Restructure dev-archive-discussions

Restructuring this Archive Discussions to reflect the new dev-support branch.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Archive all discussions and topics

Using the updated CanvasApiProcess object now. Gets 'em all.

Fixes [this issue](https://github.com/smtech/canvas/issues/13)

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-support' into dev-archive-discussions
Merge branch 'refs/heads/master' into dev-archive-discussions

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>

Conflicts:
	www/archive-discussions/.htaccess
	www/archive-discussions/config.inc.php
	www/archive-discussions/index.php
Merge branch 'refs/heads/dev-archive-discussions'
Merge branch 'refs/heads/master' into dev-archive-discussions
dev-archive-discussions End of Life

dev-archive-discussions has become its own repo: [smtech/smcanvas-archive-discussions](https://github.com/smtech/smcanvas-archive-discussions).

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-archive-discussions'