Piotr Sarnacki c4ebb3d922 Merge branch 'rename-fixes' ... Conflicts: Gemfile.lock lib/travis/api/app/endpoint.rb		2013-07-23 17:08:17 +02:00
..
tasks	Encryption rake task - increase batch size, don't be so verbose	2013-07-09 15:18:31 +02:00
travis/api	Merge branch 'rename-fixes'	2013-07-23 17:08:17 +02:00