Merge branch 'master' into master

peter279k · web-flow · commit 73fbf1b7ec16 · 2017-02-06T18:15:38.000+08:00
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "cmfcmf/openweathermap-php-api",
     "description": "A php api to parse weather data from OpenWeatherMap.org. This api tries to normalise and abstract the data and remove inconsistencies.",
-    "keywords": ["weather", "OpenWeatherMap", "weather api"],
+    "keywords": ["weather", "OpenWeatherMap", "api", "owm", "free"],
     "homepage": "https://github.com/cmfcmf/OpenWeatherMap-PHP-Api",
     "license": "MIT",
     "authors": [

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cmfcmf/openweathermap-php-api",`
`3`	`3`	`"description": "A php api to parse weather data from OpenWeatherMap.org. This api tries to normalise and abstract the data and remove inconsistencies.",`
`4`		`- "keywords": ["weather", "OpenWeatherMap", "weather api"],`
	`4`	`+ "keywords": ["weather", "OpenWeatherMap", "api", "owm", "free"],`
`5`	`5`	`"homepage": "https://github.com/cmfcmf/OpenWeatherMap-PHP-Api",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"authors": [`