forked from Business/BinStack
Skylar Ittner
0593f4c6d4
# Conflicts: # .gitignore # README.md # action.php # api.php # app.php # composer.json # composer.lock # index.php # lang/en_us.php # lang/messages.php # lib/login.php # lib/userinfo.php # mobile/index.php # nbproject/project.properties # nbproject/project.xml # pages.php # pages/404.php # pages/home.php # required.php # settings.template.php # static/css/app.css # static/img/logo.png # static/img/logo.svg # static/js/app.js
6 lines
72 B
Plaintext
6 lines
72 B
Plaintext
vendor
|
|
settings.php
|
|
nbproject/private
|
|
database.mwb.bak
|
|
*.sync-conflict*
|