Homestyx hydra
Diffusion hydra 92b72d86d75f

Merge branch 'redesign-2015' of ssh://secure.phabricator.com/diffusion/P into…
92b72d86d75f
Actions

Description

Merge branch 'redesign-2015' of ssh://secure.phabricator.com/diffusion/P into redesign-2015

Conflicts:
resources/celerity/map.php

Details

Provenance
Chad LittleAuthored on May 7 2015, 2:02 PM
sirocylPushed on Oct 16 2024, 5:49 AM
Parents
R1:cd98f2a31be0: Redesign main header
R1:476b7ef81611: Redesign main header
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

Empty Commit

This commit is empty and does not affect any paths.
styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)