Merge remote-tracking branch 'upstream/master'

Conflicts: startpage/startpage.php
2014-03-22 23:48:01 +01:00 · 2014-03-22 23:48:01 +01:00 · 81e05e6274
parent 503ec7d072 ae542a2d5d
commit 81e05e6274
2 changed files with 10 additions and 0 deletions
--- a/fromgplus/README
+++ b/fromgplus/README
@ -13,3 +13,13 @@ You need an API key for "Simple API Access".
 - At the bottom of the page you see "Simple API Access".

 The value after "API key:" is the key that you need.
+
+
+The new cloudbased Developerconsole
+
+- You go to https://code.google.com/apis/console/
+- Then you got to "APIs & auth" > "Apis" switch on Google+ API
+- Then you go to "Credentials" 
+- At the bottom of the Page you see "Public API access"
+
+The value after "API key:" is the key that you need.
--- a/startpage.tgz
+++ b/startpage.tgz