Merge pull request #461 from NoRedInk/puffins/prepare-for-merge

Puffins/prepare for merge
This commit is contained in:
Jasper Woudenberg 2020-03-02 10:41:26 +00:00 committed by GitHub
commit 4373c78d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
198 changed files with 4 additions and 2 deletions

2
.gitattributes vendored
View File

@ -1 +1 @@
styleguide-app/assets/images/** filter=lfs diff=lfs merge=lfs -text lib/noredink-ui/styleguide-app/assets/images/** filter=lfs diff=lfs merge=lfs -text

View File

@ -19,6 +19,7 @@ before_install:
make && make install; make && make install;
cd ..; cd ..;
fi fi
cd lib/noredink-ui
install: install:
- travis_retry $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 make -B setup - travis_retry $TRAVIS_BUILD_DIR/sysconfcpus/bin/sysconfcpus -n 2 make -B setup

Some files were not shown because too many files have changed in this diff Show More