Brice Maron 37b07e4e2d Merge branch 'master' into multi_app_dir ...

Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php

2012-06-21 17:15:35 +00:00

..

addBm.php

Changed bookmarklet to read later widget

2012-02-22 23:52:56 +01:00

bookmarklet.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

list.php

Merge branch 'master' into multi_app_dir

2012-06-21 17:15:35 +00:00

settings.php

sharing code between the two bookmarklets

2012-02-22 16:38:05 -05:00