1. 01 Aug, 2011 3 commits
  2. 17 Jul, 2011 1 commit
  3. 10 Jun, 2011 1 commit
  4. 06 Jun, 2011 1 commit
  5. 27 May, 2011 1 commit
  6. 18 May, 2011 1 commit
  7. 02 Mar, 2011 1 commit
  8. 14 Feb, 2011 1 commit
  9. 07 Jan, 2011 1 commit
  10. 04 Jan, 2011 1 commit
  11. 21 Dec, 2010 1 commit
  12. 06 Dec, 2010 2 commits
  13. 02 Dec, 2010 1 commit
  14. 25 Nov, 2010 1 commit
    • Jonny Bradley's avatar
      [MRG] Automatic merge, branches/6.x 30823 to 30869 · 1d13db8c
      Jonny Bradley authored
      Conflicts manually resolved this time:
      	tiki-list_posts.php
      	lib/wiki-plugins/wikiplugin_flash.php
      	lib/wiki-plugins/wikiplugin_youtube.php
      	lib/setup/prefs.php
      	tiki-setup_base.php
      	templates/tiki-list_posts.tpl
      (white space characters count!)
      1d13db8c
  15. 22 Nov, 2010 1 commit
  16. 14 Nov, 2010 1 commit
  17. 12 Nov, 2010 1 commit
  18. 07 Oct, 2010 1 commit
  19. 20 Sep, 2010 1 commit
  20. 02 Jul, 2010 2 commits
  21. 16 Jun, 2010 1 commit
  22. 26 Apr, 2010 1 commit
  23. 23 Mar, 2010 1 commit
  24. 18 Feb, 2010 1 commit
  25. 16 Feb, 2010 1 commit
  26. 13 Feb, 2010 1 commit
    • rlpowell's avatar
      · 48892f98
      rlpowell authored
      Avoid duplicates.
      -This line, and those below, will be ignored--
      
      M    tiki-setup_base.php
      48892f98
  27. 11 Feb, 2010 2 commits
  28. 05 Feb, 2010 1 commit
  29. 02 Feb, 2010 1 commit
  30. 30 Jan, 2010 1 commit
  31. 28 Jan, 2010 1 commit
  32. 26 Jan, 2010 2 commits
  33. 20 Jan, 2010 2 commits