Commits · 9cf16cd30855826ed1771a71525521f0a5cc2ed4 · wwwanlingxiao / public-apis

"mall-admin/src/main/resources/application-read.properties" did not exist on "8cb20508e869e761123861922ba31285faae24e7"

30 Jun, 2016 12 commits
- Merge branch 'DiegoRBaquero-patch-1' · 9cf16cd3
  James Brooks authored Jun 30, 2016
  
  9cf16cd3
- Add LiveCoding.tv · 1e876633
  James Brooks authored Jun 30, 2016
  
  1e876633
- Remove broken HEAD leftovers · 4a24eb59
  James Brooks authored Jun 30, 2016
  
  4a24eb59
- Merge branch 'ZakariaRidouh-patch-1' · 20cf7e90
  James Brooks authored Jun 30, 2016
  
  20cf7e90
- add Transitland API · 83e24f3a
  James Brooks authored Jun 30, 2016
  
  83e24f3a
- Merge branch 'master' of https://github.com/tadhgpearson/public-apis into tadhgpearson-master · 6fd785c0
  wesbos authored Jun 29, 2016
  
  6fd785c0
- Merge branch 'master' of https://github.com/abhisharma2/public-apis into abhisharma2-master · 8d55b13f
  wesbos authored Jun 29, 2016
  
  8d55b13f
- Merge branch 'master' of https://github.com/chap19150/public-apis into chap19150-master · de2fd84d
  wesbos authored Jun 29, 2016
  
  de2fd84d
- Merge branch 'master' of https://github.com/beeman/public-apis into beeman-master · 7f86eb4d
  wesbos authored Jun 29, 2016
  
  7f86eb4d
- Merge branch 'master' of github.com:toddmotto/public-apis · 1e81a8cc
  wesbos authored Jun 29, 2016
  
  1e81a8cc
- moved to transit · 58d51775
  wesbos authored Jun 29, 2016
  
  58d51775
- Merge branch 'master' of https://github.com/prabhakar267/public-apis into prabhakar267-master · 16dd30e8
  wesbos authored Jun 29, 2016
  
  16dd30e8
29 Jun, 2016 28 commits
- Merge branch 'AnanthaRajuC-master' · 7a5ea5d8
  Mike Street authored Jun 29, 2016
  
  7a5ea5d8
- Merge branch 'master' of git://github.com/AnanthaRajuC/public-apis into AnanthaRajuC-master · 1a921874
  Mike Street authored Jun 29, 2016
  
  1a921874
- Squashed commit of the following: · fb63b642
  Mike Street authored Jun 29, 2016
```
commit f1ce11d4a2dd8503a4f04c9cf7d8ceaae27b974c
Merge: 2e27e18b 622f6c1
Author: Mike Street <mikestreety@gmail.com>
Date:   Wed Jun 29 22:18:28 2016 +0100

    Merge branch 'master' of git://github.com/PeterKassenaar/public-apis into PeterKassenaar-master

commit 622f6c1a47eef5b31789daceca7cd04ca3435ace
Author: Peter Kassenaar <info@kassenaar.com>
Date:   Thu Apr 21 11:26:46 2016 +0200

    Delete .gitignore

commit d45ad23a635c7292c70841f5bd2ce699a9e88167
Author: Peter Kassenaar <info@kassenaar.com>
Date:   Thu Apr 21 11:24:26 2016 +0200

    Added PostcodeData.nl
```
  fb63b642
- Merge branch 'mayra-cabrera-master' · 2e27e18b
  Mike Street authored Jun 29, 2016
  
  2e27e18b
- Merge branch 'master' of git://github.com/mayra-cabrera/public-apis into mayra-cabrera-master · 2601e54b
  Mike Street authored Jun 29, 2016
  
  2601e54b
- Merge branch 'master' of github.com:toddmotto/public-apis · 0338d4aa
  Mike Street authored Jun 29, 2016
  
  0338d4aa
- Merge branch 'fmalcher-master' · 8af83726
  Mike Street authored Jun 29, 2016
  
  8af83726
- Merge branch 'master' of git://github.com/fmalcher/public-apis into fmalcher-master · a1ab2a6c
  Mike Street authored Jun 29, 2016
  
  a1ab2a6c
- Merge branch 'craigmr-transportation_atlanta_api' · 4fece327
  Mike Street authored Jun 29, 2016
  
  4fece327
- Merge branch 'Necromos-master' · b86c3bf6
  Fernando Montoya authored Jun 29, 2016
  
  b86c3bf6
- Merge branch 'transportation_atlanta_api' of... · cb708eff
  Mike Street authored Jun 29, 2016
```
Merge branch 'transportation_atlanta_api' of git://github.com/craigmr/public-apis into craigmr-transportation_atlanta_api
```
  cb708eff
- Merge branch 'master' of git://github.com/Necromos/public-apis into Necromos-master · c5502bd4
  Fernando Montoya authored Jun 29, 2016
  
  c5502bd4
- Remove DS Store · 80136dfb
  Mike Street authored Jun 29, 2016
  
  80136dfb
- Merge branch 'master' of github.com:toddmotto/public-apis · bb33f5c8
  Fernando Montoya authored Jun 29, 2016
  
  bb33f5c8
- Merge branch 'master' of github.com:toddmotto/public-apis · 11a76d44
  Mike Street authored Jun 29, 2016
  
  11a76d44
- Merge branch 'drehimself-clash-of-clans' · 3ef438ed
  Fernando Montoya authored Jun 29, 2016
  
  3ef438ed
- Merge branch 'PeterTonoli-data-gov-au' · dc498e11
  Mike Street authored Jun 29, 2016
  
  dc498e11
- Merge branch 'clash-of-clans' of git://github.com/drehimself/public-apis into... · 422ca5e2
  Fernando Montoya authored Jun 29, 2016
```
Merge branch 'clash-of-clans' of git://github.com/drehimself/public-apis into drehimself-clash-of-clans
```
  422ca5e2
- Merge branch 'data-gov-au' of git://github.com/PeterTonoli/public-apis into PeterTonoli-data-gov-au · 08627d9e
  Mike Street authored Jun 29, 2016
  
  08627d9e
- Merge pull request #152 from alexurquhart/patch-1 · aeda7b23
  Mike Street authored Jun 29, 2016
```
Added OC Transpo Live Next Bus Arrival Data Feed
```
  aeda7b23
- Merge branch 'conorcussell-master' · d066589f
  Mike Street authored Jun 29, 2016
  
  d066589f
- Merge branch 'JordanMajd-master' · 3062c1fc
  Fernando Montoya authored Jun 29, 2016
  
  3062c1fc
- Merge branch 'master' of git://github.com/JordanMajd/public-apis into JordanMajd-master · 5f4d236b
  Fernando Montoya authored Jun 29, 2016
  
  5f4d236b
- Something makes these backup files on my computer · ab37ba8c
  Mike Street authored Jun 29, 2016
  
  ab37ba8c
- Merge branch 'master' of git://github.com/conorcussell/public-apis into conorcussell-master · f6e34796
  Mike Street authored Jun 29, 2016
  
  f6e34796
- Forgot to press save with #94 merge · 4b9a4947
  Mike Street authored Jun 29, 2016
```
Oops!
```
  4b9a4947
- Merge branch 'leemark-patch-1' · 0f84a447
  Mike Street authored Jun 29, 2016
  
  0f84a447
- Merge #94 · 7666b7e8
  Mike Street authored Jun 29, 2016
```
Merge branch 'patch-1' of git://github.com/leemark/public-apis into leemark-patch-1
```
  7666b7e8