marc/karnov.club
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	index.html
This commit is contained in:
Marc Cataford 2015-12-22 01:02:28 -05:00
commit e68da0f58c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -6,3 +6,5 @@
.settings/org.eclipse.wst.jsdt.ui.superType.container .settings/org.eclipse.wst.jsdt.ui.superType.container
.settings/.jsdtscope .settings/.jsdtscope
index.html