Maikel Linke 5d5fda3a25 Merge remote-tracking branch 'origin/master' into i18n ...

Conflicts:
	config/locales/en.yml

2015-11-13 10:07:29 +11:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Merge branch 'master' into folklabs-producer-emails

2015-11-11 14:20:25 +11:00

features

Merge remote-tracking branch 'origin/master' into i18n

2015-11-13 10:07:29 +11:00

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Auto-merge from CI [skip ci]

2015-09-02 14:44:05 +10:00

jobs

Merge branch 'master' into folklabs-producer-emails

2015-10-16 12:38:54 +11:00

lib

Merge branch 'master' into folklabs-producer-emails

2015-11-11 14:20:25 +11:00

mailers

Fix quantity calculation

2015-11-05 09:43:44 +11:00

models

Merge branch 'master' into folklabs-producer-emails

2015-11-11 14:20:25 +11:00

performance

Fix currency issues, changed logo path

2015-06-18 15:38:46 +10:00

requests

scoping down large request spec

2015-06-10 13:50:55 +10:00

serializers

Switching enterprise index to its own dedicated serializer, so we can spit out ownership

2015-06-12 01:49:37 +08:00

support

Merge remote-tracking branch 'origin/master' into i18n

2015-11-13 10:07:29 +11:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Merge branch 'master' into folklabs-producer-emails

2015-10-16 12:38:54 +11:00

spec_helper.rb

Adding paper_trail verisoning RSpec helpers

2015-09-17 22:37:44 +10:00