summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-22Merge branch 'master' into master-damaster-daJonas Smedegaard
Conflicts (resolved manually): ikiwiki/openid/openid-jquery.js
2015-01-22Sync with ikiwiki 3.20141016.1.HEADmasterJonas Smedegaard
2012-08-04Merge branch 'master' into master-daJonas Smedegaard
Conflicts: ikiwiki/openid/openid-jquery.js
2012-08-04Sync with ikiwiki 3.20120419.Jonas Smedegaard
2011-10-06Merge branch 'master' into master-daJonas Smedegaard
2011-10-06Sync with ikiwiki 3.20110905.Jonas Smedegaard
2011-06-15Merge branch 'master' into master-daJonas Smedegaard
2011-06-15Sync with ikiwiki 3.20110608.Jonas Smedegaard
2010-07-19Localize openid-jquery.js.Jonas Smedegaard
2010-07-15Initial sync with ikiwiki 3.20100704.Jonas Smedegaard