diff options
| author | Hunter Stevens <onebree@gmail.com> | 2016-02-15 17:47:35 -0500 |
|---|---|---|
| committer | Hunter Stevens <onebree@gmail.com> | 2016-02-15 17:47:35 -0500 |
| commit | d0b067b140d3d351ae9dee0b3e542935b7ca35d4 (patch) | |
| tree | b83501b5b82240663029d7382f873fb369ea81c7 /ru-ru/.directory | |
| parent | cffb7e6770b517a620115b3a9e1f82ca1dd82a98 (diff) | |
| parent | cd16626c8f64a29d8235bd0ab21c7a32e248928f (diff) | |
Resolve conflicts from merge
Diffstat (limited to 'ru-ru/.directory')
| -rw-r--r-- | ru-ru/.directory | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ru-ru/.directory b/ru-ru/.directory new file mode 100644 index 00000000..4d20336b --- /dev/null +++ b/ru-ru/.directory @@ -0,0 +1,4 @@ +[Dolphin] +SortRole=size +Timestamp=2015,10,31,18,6,13 +Version=3 |