Skip to content
Snippets Groups Projects
Commit 200a3869 authored by Jared Hancock's avatar Jared Hancock
Browse files

Merge remote branch 'upstream/develop-next' into develop-next

parents 30f91280 6f93dfbc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitignore
+ 1
− 0
View file @ 200a3869
.htaccess .htaccess
php53.cgi php53.cgi
include/ost-config.php include/ost-config.php
setup/cli/modules/importer
*.sw[a-z] *.sw[a-z]
.DS_Store .DS_Store
.vagrant .vagrant
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment