Permalink
Commits on Jan 23, 2009
  1. Merge branch 'master' of git@github.com:mattetti/merb-book

    mattetti committed Jan 23, 2009
    * 'master' of git@github.com:mattetti/merb-book: (96 commits)
      Traduction BDD
      Traduction rspec-histoire
      Correct appendix
      Crrect typo
      Review toc footer
      Traduction BDD
      Traduction BDD
      Traduction rspec-histoire
      Traduction BDD
      Traduction rspec-histoire
      Traduction BDD
      Traduction rspec-histoire
      Correct appendix
      Review toc footer
      Traduction BDD
      Traduction rspec-histoire
      Correct appendix
      Review main toc following nl example
      Review toc footer
      Review index header
      ...
  2. Merge branch 'english'

    mattetti committed Jan 23, 2009
    * english:
      fixed the tocs and specs
  3. fixed the tocs and specs

    mattetti committed Jan 23, 2009
  4. Merge branch 'english' of git://github.com/mattetti/merb-book into en…

    jdunphy committed Jan 23, 2009
    …glish
    
    Conflicts:
    	book-content/en/5-interacting-with-the-database-sequel/4-model-associations.markdown
Commits on Jan 22, 2009
  1. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  2. Traduction rspec-histoire

    Alexandre Girard committed with pointcom Dec 13, 2008
  3. Correct appendix

    Alexandre Girard committed with pointcom Dec 13, 2008
  4. Crrect typo

    Alexandre Girard committed with pointcom Dec 13, 2008
  5. Review toc footer

    Alexandre Girard committed with pointcom Dec 13, 2008
  6. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  7. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  8. Traduction rspec-histoire

    Alexandre Girard committed with pointcom Dec 13, 2008
  9. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  10. Traduction rspec-histoire

    Alexandre Girard committed with pointcom Dec 13, 2008
  11. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  12. Traduction rspec-histoire

    Alexandre Girard committed with pointcom Dec 13, 2008
  13. Correct appendix

    Alexandre Girard committed with pointcom Dec 13, 2008
  14. Review toc footer

    Alexandre Girard committed with pointcom Dec 13, 2008
  15. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  16. Traduction rspec-histoire

    Alexandre Girard committed with pointcom Dec 13, 2008
  17. Correct appendix

    Alexandre Girard committed with pointcom Dec 13, 2008
  18. Review main toc following nl example

    Alexandre Girard committed with pointcom Dec 13, 2008
  19. Review toc footer

    Alexandre Girard committed with pointcom Dec 13, 2008
  20. Review index header

    Alexandre Girard committed with pointcom Dec 13, 2008
  21. Correct typo

    Alexandre Girard committed with pointcom Dec 13, 2008
  22. Traduction BDD

    Alexandre Girard committed with pointcom Dec 13, 2008
  23. Correct appendix

    Alexandre Girard committed with pointcom Dec 13, 2008
  24. Translate Types and App

    Alexandre Girard committed with pointcom Dec 13, 2008
  25. Review main toc following nl example

    Alexandre Girard committed with pointcom Dec 13, 2008
  26. Review toc footer

    Alexandre Girard committed with pointcom Dec 13, 2008
  27. Review index header

    Alexandre Girard committed with pointcom Dec 13, 2008
  28. Traduction rspec-histoire

    Alexandre Girard committed with pointcom Dec 13, 2008
  29. Correct typo

    Alexandre Girard committed with pointcom Dec 13, 2008
  30. Correct appendix

    Alexandre Girard committed with pointcom Dec 13, 2008
  31. Crrect typo

    Alexandre Girard committed with pointcom Dec 13, 2008