1
0
mirror of https://github.com/danog/public-apis.git synced 2024-11-27 04:24:48 +01:00
Commit Graph

329 Commits

Author SHA1 Message Date
Mike Street
0338d4aa1b Merge branch 'master' of github.com:toddmotto/public-apis 2016-06-29 22:13:04 +01:00
Mike Street
8af8372678 Merge branch 'fmalcher-master' 2016-06-29 22:12:36 +01:00
Mike Street
a1ab2a6ccb Merge branch 'master' of git://github.com/fmalcher/public-apis into fmalcher-master 2016-06-29 22:12:20 +01:00
Mike Street
4fece32774 Merge branch 'craigmr-transportation_atlanta_api' 2016-06-29 22:10:11 +01:00
Fernando Montoya
b86c3bf604 Merge branch 'Necromos-master' 2016-06-29 16:09:57 -05:00
Mike Street
cb708effad Merge branch 'transportation_atlanta_api' of git://github.com/craigmr/public-apis into craigmr-transportation_atlanta_api 2016-06-29 22:09:53 +01:00
Fernando Montoya
c5502bd4cc Merge branch 'master' of git://github.com/Necromos/public-apis into Necromos-master 2016-06-29 16:09:48 -05:00
Mike Street
80136dfbe8 Remove DS Store 2016-06-29 22:08:25 +01:00
Fernando Montoya
bb33f5c805 Merge branch 'master' of github.com:toddmotto/public-apis 2016-06-29 16:07:25 -05:00
Mike Street
11a76d44e5 Merge branch 'master' of github.com:toddmotto/public-apis 2016-06-29 22:07:10 +01:00
Fernando Montoya
3ef438edf3 Merge branch 'drehimself-clash-of-clans' 2016-06-29 16:07:04 -05:00
Mike Street
dc498e1106 Merge branch 'PeterTonoli-data-gov-au' 2016-06-29 22:07:00 +01:00
Fernando Montoya
422ca5e22b Merge branch 'clash-of-clans' of git://github.com/drehimself/public-apis into drehimself-clash-of-clans 2016-06-29 16:06:56 -05:00
Mike Street
08627d9e44 Merge branch 'data-gov-au' of git://github.com/PeterTonoli/public-apis into PeterTonoli-data-gov-au 2016-06-29 22:06:39 +01:00
Mike Street
aeda7b233a Merge pull request #152 from alexurquhart/patch-1
Added OC Transpo Live Next Bus Arrival Data Feed
2016-06-29 22:05:42 +01:00
Mike Street
d066589ffe Merge branch 'conorcussell-master' 2016-06-29 22:05:12 +01:00
Fernando Montoya
3062c1fc0e Merge branch 'JordanMajd-master' 2016-06-29 16:04:53 -05:00
Fernando Montoya
5f4d236b5a Merge branch 'master' of git://github.com/JordanMajd/public-apis into JordanMajd-master 2016-06-29 16:04:45 -05:00
Mike Street
ab37ba8c67 Something makes these backup files on my computer 2016-06-29 22:04:35 +01:00
Mike Street
f6e347962d Merge branch 'master' of git://github.com/conorcussell/public-apis into conorcussell-master 2016-06-29 22:04:10 +01:00
Mike Street
4b9a4947a1 Forgot to press save with #94 merge
Oops!
2016-06-29 22:00:46 +01:00
Mike Street
0f84a447c7 Merge branch 'leemark-patch-1' 2016-06-29 22:00:23 +01:00
Mike Street
7666b7e8d7 Merge #94
Merge branch 'patch-1' of git://github.com/leemark/public-apis into leemark-patch-1
2016-06-29 21:59:53 +01:00
Mike Street
13f46c7f35 Merge Railways into Transport 2016-06-29 21:57:51 +01:00
Mike Street
55be642422 Merge branch 'master' of git://github.com/YuvarajTana/public-apis 2016-06-29 21:57:20 +01:00
Mike Street
4006d82c17 Merge branch 'crocodele-master' 2016-06-29 21:52:43 +01:00
Mike Street
74c3f29578 Merge branch 'master' of git://github.com/crocodele/public-apis into crocodele-master 2016-06-29 21:51:55 +01:00
Mike Street
04ba85d92a Merge branch 'gonzalec-master' 2016-06-29 21:50:59 +01:00
Mike Street
220a4587a6 Merge branch 'master' of git://github.com/gonzalec/public-apis into gonzalec-master 2016-06-29 21:50:42 +01:00
Mike Street
1fea7c2e35 Merge branch 'jabranr-feature/more-api' 2016-06-29 21:48:45 +01:00
Mike Street
a928477acb Merge branch 'feature/more-api' of git://github.com/jabranr/public-apis into jabranr-feature/more-api 2016-06-29 21:48:30 +01:00
Mike Street
5d13b3a465 Collate Weather APIs 2016-06-29 21:46:10 +01:00
Mike Street
25e3926d28 Merge branch 'lordviktor-patch-1' 2016-06-29 21:44:23 +01:00
Mike Street
0876e649f9 Add country for London transport 2016-06-29 21:44:06 +01:00
Mike Street
c788653c18 Merge branch 'patch-1' of git://github.com/lordviktor/public-apis into lordviktor-patch-1 2016-06-29 21:43:35 +01:00
Mike Street
43081a781c Merge branch 'vladkhvo-patch-1' 2016-06-29 21:40:02 +01:00
Mike Street
c4e17efff3 Merge branch 'patch-1' of git://github.com/vladkhvo/public-apis into vladkhvo-patch-1 2016-06-29 21:39:50 +01:00
Mike Street
ec5aab3edb Merge branch 'awalthefirst-master' 2016-06-29 21:38:51 +01:00
Mike Street
a12ff8e484 Update some spacing 2016-06-29 21:38:39 +01:00
Mike Street
beebe9d213 Merge branch 'master' of git://github.com/awalthefirst/public-apis into awalthefirst-master 2016-06-29 21:37:44 +01:00
Mike Street
c269e3fe12 Add Dark Sky Weather API 2016-06-29 21:34:39 +01:00
Mike Street
b9ede300cd Merge branch 'mAzurkovic-patch-2' 2016-06-29 21:33:22 +01:00
Mike Street
9c3d18ebc9 Merge branch 'master' of github.com:toddmotto/public-apis; branch 'patch-2' of git://github.com/mAzurkovic/public-apis into mAzurkovic-patch-2 2016-06-29 21:33:06 +01:00
wesbos
d2935e6f91 fixes the merge conflict 2016-06-29 10:40:52 -04:00
wesbos
c5f29aba00 add wikipedia. Fixes #155 2016-06-29 10:07:57 -04:00
James Brooks
0bcbb0c6a0 Merge pull request #179 from dmytroKarataiev/master
USGS Earthquakes data
2016-06-29 15:04:19 +01:00
James Brooks
e45c75dbfe Merge pull request #184 from alexarroyoduque/master
docs(games): battle.net blizzard api
2016-06-29 15:04:04 +01:00
James Brooks
d3f85d01ba Merge pull request #97 from steveholt55/master
Adds Minneapolis, MN public transit API and Dark Sky Forecast API
2016-06-29 15:03:53 +01:00
wesbos
b393e3b9eb Merge branch 'master' of github.com:toddmotto/public-apis 2016-06-29 10:03:32 -04:00
James Brooks
c5ea6af1d2 Merge pull request #110 from Cisneiros/patch-1
Correct Transport for London acronym
2016-06-29 15:03:21 +01:00