Skip to content
This repository was archived by the owner on May 19, 2021. It is now read-only.

Conversation

@chris34
Copy link
Member

@chris34 chris34 commented Aug 29, 2017

Seems like I did some work twice – with some months as gap between it. (compare https://github.com/inyokaproject/theme-default/compare/feature/acl with #187)

I now extracted all changes from feature/acl which are still relevent. After a merge, ACL should be fully migrated into the existing templates of theme-default. So, after this one is merged the branch feature/acl can be deleted…

@Lyra2108 Lyra2108 merged commit f7beb17 into inyokaproject:staging Sep 9, 2017
@chris34 chris34 deleted the acl-merge-double-work branch September 9, 2017 22:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants