Merge sc:awesome
Conflicts: .gitignore rc.lua
This commit is contained in:
commit
e99fc2325f
27 changed files with 499 additions and 607 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1 +1,2 @@
|
|||
wp
|
||||
wallpaper
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue