Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update #5

Merged
merged 5 commits into from
Oct 1, 2014
Merged

update #5

merged 5 commits into from
Oct 1, 2014

Commits on Sep 29, 2014

  1. Rename the title of the location edit page. 

    Fixes #22
    Tim Schumacher committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    3494995 View commit details
    Browse the repository at this point in the history

  2. Add a description to the location edit icon. 

    Fixes #21
    Tim Schumacher committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    9330814 View commit details
    Browse the repository at this point in the history

  3. Use the right object *grml* 

    Fixes #27
    Tim Schumacher committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    69289df View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2014

  1. Update dependencies to include 0.3 of teh relative date parser. 

    Ticket #29
    Tim Schumacher committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    cbc62dc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://phablab.krautspace.de/diffusion/C/ca… 

    …lcifer

Conflicts:
	composer.lock
    Tim Schumacher committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    7c2c17c View commit details
    Browse the repository at this point in the history