Merge branch 'tiddlywiki-com'

editions/dev/tiddlers/system/github-fork-ribbon.tid

@@ -1,5 +1,5 @@
 title: $:/editions/dev/github-fork-ribbon
-tags: $:/tags/PageControls
+tags: $:/tags/PageTemplate
 caption: ~GitHub ribbon
 description: ~GitHub ribbon for tw5.com/dev
 

editions/dev/tiddlywiki.info

@@ -3,6 +3,7 @@
 	"plugins": [
 		"tiddlywiki/highlight",
 		"tiddlywiki/nodewebkitsaver",
+		"tiddlywiki/github-fork-ribbon",
 		"tiddlywiki/menubar",
 		"tiddlywiki/internals"
 	],

editions/tw5.com/tiddlers/_tw_shared/favicons/tiddlywiki.com.upgrade.ico.meta

@@ -0,0 +1,2 @@
+title: $:/_tw_shared/favicons/tiddlywiki.com.upgrade
+type: image/x-icon

editions/tw5.com/tiddlers/_tw_shared/sites/tiddlywiki.com.upgrade.tid

@@ -0,0 +1,6 @@
+title: $:/_tw_shared/sites/tiddlywiki.com.upgrade
+tags: $:/tags/TiddlyWikiSites
+caption: tiddlywiki.com/upgrade.html
+description: Upgrading Wizard
+url: https://tiddlywiki.com/upgrade.html
+icon: $:/_tw_shared/favicons/tiddlywiki.com.upgrade

editions/tw5.com/tiddlers/_tw_shared/tags-TiddlyWikiSites.tid

@@ -1,2 +1,2 @@
 title: $:/tags/TiddlyWikiSites
-list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/classic.tiddlywiki.com
+list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com