phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Browse Source 
Conflicts:
	style.css
This commit is contained in:
Jon Atkins
2013-02-11 13:33:10 +00:00
parent 318057fd1b 50762bcc39
commit ece492f1ca
10 changed files with 142 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -81,6 +81,7 @@ Contributors
[JasonMillward](https://github.com/JasonMillward),
[mledoze](https://github.com/mledoze),
[OshiHidra](https://github.com/OshiHidra),
[Pirozek](https://github.com/Pirozek),
[Scrool](https://github.com/Scrool),
[sorgo](https://github.com/sorgo),
[Xelio](https://github.com/Xelio),