Skip to content
Commits on May 25, 2012
  1. @aron

    Merge branch 'next/3' into 'feature/node'

    aron committed
    Massive merge I'm sure nearly everything is broken :)
    
    Conflicts:
    	config.default.php
    	index.php
    	js/chrome/download.js
    	public/app.php
    	public/font/fontawesome-webfont.eot
    	public/font/fontawesome-webfont.svg
    	public/font/fontawesome-webfont.svgz
    	public/font/fontawesome-webfont.ttf
    	public/font/fontawesome-webfont.woff
    	public/font/pictos-web.eot
    	public/font/pictos-web.svg
    	public/font/pictos-web.ttf
    	public/font/pictos-web.woff
    	public/js/chrome/login.js
    	public/js/chrome/navigation.js
    	public/js/jsbin.js
Commits on Apr 20, 2012
  1. @aron

    Merge branch 'next/3' into feature/node

    aron committed
    Conflicts:
    	index.php
Commits on Apr 19, 2012
  1. @aron

    Merge branch 'next/3' into feature/node

    aron committed
    Conflicts:
    	index.php
Commits on Apr 17, 2012
  1. @aron

    Move PHP codebase into ./public directory

    aron committed
    Updated all relevant paths to point to new locations. Webs servers will
    need to be updated to point to ./public. The build script remains in the
    root and will work as before.
Something went wrong with that request. Please try again.