Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update master #2

Merged
merged 12 commits into from
Dec 20, 2017
+1,802 −892
Merged

update master #2

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d0e3254
Added and fixed danish translations.
Jun 2, 2017
c581d71
Rebuild spanish yml descriptors based on en.yml core file: https://g…
Aug 4, 2017
8ca586c
Update german translations for solidus_i18n #9703
vasschneider Sep 12, 2017
3a69456
Merge pull request #93 from bofrede/master
mamhoff Sep 12, 2017
2c60f2b
Merge pull request #97 from 2beDigital/master
mamhoff Sep 12, 2017
01087a7
fix typo after review-feedback
vasschneider Sep 12, 2017
6d37d18
Build on precise because of Travis MySQL problems
tvdeyen Sep 13, 2017
9809675
Merge pull request #99 from tvdeyen/fixes-travis-mysql-builds
tvdeyen Sep 14, 2017
f733892
Merge branch 'master' into feature-7903
vasschneider Sep 15, 2017
ac21bc5
Merge pull request #98 from taktsoft/feature-7903
mamhoff Sep 15, 2017
4acfce1
Add Solidus v2.4 to .travis.yml
Oct 23, 2017
946d725
Update to new FactoryBot name
Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Need to stay on precise until Travis fixes their MySQL problems
# See: https://github.com/travis-ci/travis-ci/issues/8331
dist: precise
sudo: false
cache: bundler
language: ruby
Expand Down
Loading