glenux/aoidos
glenux/aoidos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:glenux/aoidos

Browse source
This commit is contained in:
Glenn Y. Rolland 2016-10-05 10:34:16 +02:00
commit 3a6031947c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -1,3 +1,8 @@
Gemfile.lock Gemfile.lock
<<<<<<< HEAD
*.ods *.ods
*.ods# *.ods#
=======
.~lock*
*.ods
>>>>>>> c64b0304619181fe571e4fe10831272881487e01