1. 06 Feb, 2015 1 commit
  2. 30 Jan, 2015 1 commit
  3. 29 Sep, 2014 1 commit
  4. 07 Aug, 2014 2 commits
  5. 02 Jul, 2014 3 commits
  6. 20 Dec, 2013 4 commits
  7. 26 Aug, 2013 1 commit
  8. 09 Aug, 2013 2 commits
  9. 08 Aug, 2013 1 commit
  10. 04 Jul, 2013 1 commit
  11. 12 Jun, 2013 2 commits
  12. 11 Jan, 2013 1 commit
  13. 05 Jan, 2013 1 commit
  14. 11 Dec, 2012 1 commit
  15. 07 Dec, 2012 1 commit
  16. 23 Oct, 2012 1 commit
  17. 28 Sep, 2012 1 commit
  18. 20 Sep, 2012 1 commit
  19. 20 Jun, 2012 1 commit
  20. 06 Jun, 2012 1 commit
  21. 15 Mar, 2012 1 commit
  22. 12 Jan, 2012 1 commit
  23. 21 Sep, 2011 1 commit
  24. 18 Aug, 2011 1 commit
  25. 14 Aug, 2011 1 commit
  26. 13 Aug, 2011 1 commit
  27. 09 Aug, 2011 1 commit
  28. 04 Jul, 2011 1 commit
    • jonnybradley's avatar
      [MRG] Automatic merge, branches/7.x 35090 to 35187 · 32eb34e7
      jonnybradley authored
      Conflicts occured during the merge. (hopefully correctly fixed - authors please check - remember: whitespace counts!)
      	tiki-edit_draw.php
      	lib/setup/prefs.php
      	lib/webmail/tikimaillib.php
      	lib/prefs/email.php
      	templates/tiki-admin_include_general.tpl
      32eb34e7
  29. 30 Jun, 2011 1 commit
  30. 22 Jun, 2011 1 commit
  31. 21 Jun, 2011 1 commit
  32. 21 Apr, 2011 1 commit